.classpath
Fixed?
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
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Added CommentsAdapter and DecisionAdapter classes and associated xml files. As well, added a getText() method to Decision class.
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
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