Merge pull request #9 from jrunningen/master

Remove the unused applicants scaffold
removing this. pull requests woo
holy crap user login
wtf is all this temp business
front end stuff
Merge pull request #22 from ouzy/housing-ouzy-branch

front end stuff
Merge branch 'authentication' of https://github.com/lankyfrenchman/dchousing-apps into lankyfrenchman-authentication

Conflicts:
	Gemfile.lock
	db/development.sqlite3
	log/development.log
Merge remote-tracking branch 'origin/master'

* origin/master:
  front end stuff
  wtf is all this temp business
  holy crap user login
  removing this. pull requests woo

Conflicts:
	Gemfile.lock
	db/schema.rb
Remove accidentally committed tmp contents
Don't track the sqlite3 db or logs