fixed numerous bugs
Merge branch 'master' of https://github.com/Senior-Project-2013/Worphles