fixed merge stuff in Comment.java
removed duplicate main_menu.xml
Fixed XML layouts. Added missing gen directory that was causing problems
Merge pull request #61 from klindenbach/master

Fixed XML layouts. Added missing gen directory that was causing problems
commented out references to nonexistent MyApplication...?
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
#50 Creates methods and test to add and update stories
#50 added decisions to pages
Merge pull request #63 from klindenbach/50-ESHandler

50 es handler
#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
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java