Merge pull request #27 from pixelsign/gh-pages

merge

Author: pixelsign

CREDITS.txt

@@ -44,5 +44,19 @@ http://themt.deviantart.com/art/Photoshop-da-Samsung-Smart-TV-PSD-Yapmak-2889633
 Samsung Galaxy Tab 4 10.1", & 8"
 http://tweakers.net (original pictures, edited.)
 
+- New devices added by ben182
 
+iPhone6
+http://www.pixeden.com/psd-mock-up-templates/iphone-6-psd-vector-mockup
 
+iPhone 6 Plus
+http://www.pixeden.com/psd-mock-up-templates/iphone-6-plus-psd-vector-mockup
+
+MacBook Air
+https://www.behance.net/gallery/34637999/Free-Vector-Based-MacBook-Air-Mockup
+
+Macbook 2015
+http://www.pixeden.com/psd-mock-up-templates/the-new-macbook-psd-mockup
+
+Apple Watch
+https://dribbble.com/shots/1719188--Watch-PSD-Template

Device Berechnung.xlsx

@@ -124,7 +124,7 @@ <h1>HTML5 device mockups.</h1>
 
         </div>
 
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         <script type="text/javascript">
             $(document).ready(function(){
 
@@ -171,4 +171,4 @@ <h1>HTML5 device mockups.</h1>
 
 
     </body>
-</html>
+</html>

Mockup Device Generator.html

@@ -1,4 +1,4 @@
-HTML5 device mockups
+HTML5 device mockups 2.0
 ====================
 
 You can view the demo page of all devices here: http://pixelsign.github.io/html5-device-mockups/
@@ -31,20 +31,31 @@ Features:
 * Multiple orientations
 * Two separate ways for integrating the devices to your site
 
+New in 2.0:
+* iPhone 6
+* iPhone 6 Plus
+* iPhone SE
+* iPad Air
+* iPad Air 2
+* iPad Pro
+* Macbook 2015
+* Minified CSS Files
+* NEW PROJECT PAGE
+
 Integrating to your website:
 ----------------------------
 
 *STEP 1)*
 
         Import either one of the provided CSS file to your project:
 
-                Import "device-mockups/device-mockups.css"
+                Import "device-mockups/device-mockups.min.css"
                         - If you want to define the devices using CSS class names
-                        - <link rel="stylesheet" type="text/css" href="device-mockups/device-mockups.css" />
+                        - <link rel="stylesheet" type="text/css" href="device-mockups/device-mockups.min.css" />
 
-                Import "device-mockups/device-mockups2.css"
+                Import "device-mockups/device-mockups2.min.css"
                         - If you want to define the devices using HTML tag attributes
-                        - <link rel="stylesheet" type="text/css" href="device-mockups/device-mockups2.css" />
+                        - <link rel="stylesheet" type="text/css" href="device-mockups/device-mockups2.min.css" />
 
 *STEP 2)*