generate users controller
Merge branch 'master' into users
fix guardfile, change README
change layout