commit test
Merge pull request #6 from rhannequin/master

Create Event entity
Merge remote-tracking branch 'upstream/master'
generated user scaffolding
Revert "commit test"

This reverts commit b2330d60912f35eb7a4731e33a81f6e317f189a1.

ignore this commit
Merge pull request #12 from jduval/master

generated User scaffolding
add field validator and update users' table (do not forget rake db:migrate)
Merge pull request #15 from rhannequin/master

Event controller and model tests
add bcrypt to encrypt password
merge upstream master
specify ruby version in gemfile
add severals rules to user model + exclude password from json output + FIXME bcrypt password
Merge pull request #16 from jduval/master

THE long-awaited PR on Users' features
add encrypted password feature
Merge pull request #17 from jduval/master

Add encrypted password feature
Add tests to User model
Test Users Controller