doin fixes
Merge branch 'master' of https://github.com/brandwarbs/AP-Java-Projects.git