Merge branch '82-JavaDoc' of https://github.com/klindenbach/301project into klindenbach-82-JavaDoc

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

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
#70 Added licenses to files missing a license
added license to xml files
Merge pull request #142 from klindenbach/70-license-headers

#70 license headers