I don't even remember.
Merge branch 'master' of github.com:JacksonGariety/HashTraffic-Alpha

Conflicts:
	config/routes.rb
It has definetley been 7 mother-fucking hours since my last commit. Changes list model to accounts. Now uses Rack middleware for invitations. A ton of other crap.