style and shit
Merge branch 'master' of https://github.com/dshields1/PartyGenius

Conflicts:
	Dylan/app/views/tweets/index.html.erb