Turned homepage hackathon style lol.
Merge branch 'master' of https://github.com/nelson-liu/BitStation-App

Conflicts:
	app/views/layouts/application.html.erb