minor changes to user controller
Merge branch 'master' of github.com:alexycheung/sarmander
Merge branch 'master' of github.com:alexycheung/sarmander
Merge branch 'master' of github.com:alexycheung/sarmander
remove styling and comment out header