added storyboard images
removed unneeded images.
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
adding gen files so I can pull changes
changes pulled from proj
pulling changes
experiment
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
#67 resolved all warnings, mostly adding getters for unused variables
#70 added license headers to all files
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 70-license-headers

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
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
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Reader.java
Merge pull request #79 from klindenbach/master

#67 resolved all warnings, mostly adding getters for unused variables
pulled out incomplete parcelable implementation so the project will build
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge branch 'master' of https://github.com/KarlParkinson/301project into KarlParkinson-master

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