Add javaDOcs
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers
added javadocs
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers