Fixed all bugs recorded in the test record
Merge branch 'master' of github.com:em-mo/blacklagoon