+
Merge branch 'master' of https://github.com/WhereToGo/web

Conflicts:
	coffee/views/main/index.coffee
	css/style.css
Merge branch 'master' of https://github.com/WhereToGo/web

Conflicts:
	css/style.css