Cleaned up unneccesary code and added javadoc comments where needed
Merge branch 'master' of https://github.com/j-rewerts/Team17Project