added storyboard images
removed unneeded images.
.classpath
Fixed?
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Saving changes
adding gen files so I can pull changes
changes pulled from proj
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
experiment
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
#67 resolved all warnings, mostly adding getters for unused variables
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge pull request #80 from klindenbach/70-license-headers

#70 added license headers to all files
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

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