Remove redundant codes
Layout
Modify controller User to Users, and stage in Chapter 7
Merge branch 'master' of git://github.com/bay6/prepare