start styling
Merge branch 'master' of github.com:JohnAmican/merch-perch
devise registration username
Merge branch 'master' of github.com:JohnAmican/merch-perch
stylin
Merge branch 'master' of github.com:JohnAmican/merch-perch

Conflicts:
	app/views/layouts/application.html.haml
'more stylin'
Merge branch 'master' of github.com:JohnAmican/merch-perch

Conflicts:
	app/views/events/index.html.haml
styling completely horrible
Merge branch 'master' of github.com:JohnAmican/merch-perch

Conflicts:
	app/views/devise/_registration.html.haml
	app/views/layouts/application.html.haml