Merge branch 'config'
merge web branch
Merge branch 'master' of https://github.com/erahm/fatbard
adding sass gem
Merge branch 'master' of github.com:erahm/fatbard
Merge branch `web` to `master`
Merge branch `web` to `master`
Added User model and Controller. Also added growl for autotest
Merge branch 'user-model'
Merge pull request #2 from erahm/user-model

Added User model and Controller. Also added growl for autotest
Merge branch 'master' of https://github.com/erahm/fatbard
Changed some tests
Added modules for routes
Fixed UserController Test
Merge branch 'master' of github.com:erahm/fatbard
Adding go back link to enroll page