more stuff on log in.. still no real code though
what.. is this..
Merge branch 'master' of https://github.com/each3ric/hackthenorth

Conflicts:
	MakeItRain.xcodeproj/project.pbxproj
	MakeItRain/Base.lproj/Main.storyboard