Updated the storyboard
Cleaned up unneccesary code and added javadoc comments where needed
Merge branch 'master' of https://github.com/j-rewerts/Team17Project
Merge pull request #105 from j-rewerts/master

Updated the storyboard