Finish authentication
Add initial config
Add gemlock
Merge branch 'master' of https://github.com/hackmcgill/hack_mcgill into feature/project-et-compagnie

Conflicts:
	app/models/user.rb