Merge remote-tracking branch 'origin' into development
rename order.js to menuorder.js
Add My Main Page html and css
Merge pull request #18 from 54wang17/development

add my main page
Merge pull request #19 from danuzclaudes/OrderDevelopment

11/12/2014 Master - OrderDevelopment
Merge pull request #21 from danuzclaudes/development

11/12/2014 Master - Development
change html to php
rename and modify
rename MenuOrder.js to Order.js and rename ~HEAD
Merge pull request #22 from danuzclaudes/RestaurantDevelopment

11/15/2014 Master - RestaurantDevelopment
Merge pull request #23 from danuzclaudes/master

11/15/2014 Development - Master