Before pull.
Merge branch 'master' of https://github.com/unknownbreaker/bachelor.ette

Conflicts:
	db/migrate/20141010122609_create_users.rb
Ready for thread.
Merge pull request #4 from tsabend/master

Fixed password_hash naming