commit test
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