#64 Comments now added to story via update
Merge branch '64-comment-updates' of https://github.com/klindenbach/301project into klindenbach-64-comment-updates

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Comment.java
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project