Add comments
Second version of user interface
Change LabelOf to NameOf
 Take out WhereIsQuestion and add it to NewBasic, beacuase it had my update about hotels
Take out comments, and add a few updates on Hotel
updated title
resolved conflicts
Merge branch 'master' of heroku.com:pacific-river-6269

Conflicts:
	views/index.tpl
updated front-end