.classpath
Fixed?
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
fixed merge crap in Comment.java
Saving changes
adding gen files so I can pull changes
changes pulled from proj
Added Handler exceptions
Merge pull request #68 from klindenbach/50-ESHandler

Added Handler exceptions, looks good
Merge pull request #69 from jcadek/master

Creating stories and other tweaks.
Merge pull request #72 from jcadek/master

Fleshing out code, new UIMockup
 #73 added a get all stories method to ES Handler.
pulling changes
Changed .gitignore
Changed .gitignore and Requirements
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Created ViewPageAdapter to use with ListView in ViewPageActivity
Merge pull request #74 from klindenbach/73-getAllStories

 #73 added a get all stories method to ES Handler.
So this is the new PDF. I didn't know if clicking on the story from the main menu automatically loads it. If it does, delete slide 9
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project