Merge branch 'master' of git.assembla.com:lecturer_ukdw

tekkom-ti/PRESENTASI

@@ -5,11 +5,12 @@ A1
 71120108
 71120106
 
-A2
+A2 (Wireless Hard Drive)
 71120095
 71120109
 71120097
 71120086
+71120098
 
 A3 (Wireless Printers)
 71120119
@@ -17,13 +18,13 @@ A3 (Wireless Printers)
 71120085
 71120111
 
-A4
+A4 (Sixth Sense - Augmented Reality)
 71120118
 71120088
 71120102
 71120103
 
-A5
+A5 (USB 3.0)
 71120105
 71120012
 71120083
@@ -35,24 +36,24 @@ A6
 71120082
 71120092
 
-A7
+A7 (Gesture Cube)
 71120094
 71120093
 71120084
 71120117
 
-A8
+A8 (Flexible Screen)
 71120113
 71120087
 71120081
 71120101
 
-A9
+A9 (DDR 3)
 71120100
 71120090
 71120120
 
-B1
+B1 (Fingerprint Sensors)
 71120122
 71120128
 71120143
@@ -64,7 +65,7 @@ B2
 71120133
 71120142
 
-B3
+B3 (Ergosensor)
 71120152
 71120127
 71120145
@@ -93,7 +94,7 @@ B7
 71120121
 71120148
 
-B8
+B8 (MINDSET NeuroSky)
 71120137
 71120131
 71120123

tekkom-ti/index.php

@@ -28,7 +28,7 @@ include "../includes/courses.php";
        Hari Rabu<br/>Jam 13.30<br/>Ruang D.3.5</p>
     <hr/>
     <p>Grup D<br/>Hari Senin<br/>Jam 14.30<br/>Ruang D.3.1<br/>
-       Hari Rabu<br/>Jam 17.00<br/>Ruang D.3.1</p>
+       Hari Rabu<br/>Jam 17.00<br/>Ruang D.3.5</p>
   </aside>
   <header>
     <h3><a href="PRESENTASI">Topik Presentasi</a></h3>