cleanup and getting exceptions online
Merge branch 'master' of github.com:comp615/StrangerFB