#82 Added JavaDoc comments to bottom half of classes
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 82-JavaDoc

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Merge pull request #102 from klindenbach/82-JavaDoc

#82 Added JavaDoc comments to bottom half of classes