#162 finished uml and started javadocs #82
Resolved #213 #264 Updated help for fighting
Merge pull request #271 from klindenbach/master

Resolved #213 #264 Updated help for fighting
Finished adding javadocs
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
#82 finished javadocs and fixed a bug
Merge pull request #276 from moorej12/master

#82 javadocs done and fixed not being able to add photo comments
Generated javadocs
Added new javadoc htmls
Merge pull request #277 from moorej12/master

Generated javadocs
Fixed another bug with photo comments
Fixed Conditional Appearence
Merge pull request #278 from moorej12/master

Fixed another bug with photo comments
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Merge pull request #280 from jcadek/master

Fixed GUI stuff