fixes helper formatting
trying to create
Trying to work this out
fixes merges
Merge branch 'master' of https://github.com/opleban/lil_twitter_no_care into Ori

Conflicts:
	app/helpers/authentication.rb
	app/helpers/helper.rb
More cleanup, gets rid of followship
MMMMERGE
Merge pull request #8 from opleban/Ori

Ori