le wei stuff
Merge branch 'master' of https://github.com/ryanjadhav/foursquare_hackathon

Conflicts:
	app/views/home/index.html.haml