adding authentication
Merge branch 'master' of https://github.com/vanhoofseppe/firstModel

Conflicts:
	config/routes.rb