Doing some initial mobile app shiz
Latest commit

Merge branch 'master' of https://github.com/nick-doherty/hopp

Conflicts:
	app/views/pages/home.html.erb