Login, remember_me token fixed
git ignore commit
Merge branch 'master' of https://github.com/pascalwilbrink/proof-of-concept
Merge branch 'master' of https://github.com/pascalwilbrink/proof-of-concept

Conflicts:
	.gitignore
	poc/app/models/user.rb