add hello message
Merge branch 'development' of https://github.com/danuzclaudes/HeelFoodie into development

Update Template
11/09/2014 V2 - index finished
Merge pull request #6 from danuzclaudes/master

11/09/2014 V2 - index finished
11/09/2014 V2 - index finished
Merge branch 'development' of https://github.com/danuzclaudes/HeelFoodie into development
Merge branch 'master' of https://github.com/danuzclaudes/HeelFoodie into development
Merge branch 'RestaurantDevelopment' into development
Add Address input
Merge branch 'development' into test

Conflicts:
	css/gmap.css
Merge branch 'test' into development
First Address Input& Confirm
delete test file
Merge pull request #10 from 54wang17/development

Order Input&Confirm 1st Edition
Merge pull request #11 from danuzclaudes/OrderDevelopment

test merge from OrderDev