styling updates
JUST MERGE
Merge branch 'master' of github.com:kelvinw88/CrunkBox

Conflicts:
	app/views/drunk/index.erb
	app/views/high/index.erb
	app/views/sober/index.erb
remove unused files
Norman doesn't know what this is
fix merge conflict