fixed wierd lines in class diagram, went through and checked to see code was mostly following coding convention
updated javadocs, but they look wierd when I open them
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
fixed javadocs
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
added javadocs that weren't added i last commit, some small u^pdates in test cases
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork