added comments fixed some bugs
So much problems
Merge branch 'master' of https://github.com/TeamErrol/Team-Errol