TODO, bug fixes
Merge branch 'user' of http://github.com/alex3165/hackcessangels into user