trying to git pull. fixing conflicts
committing merge on tuesday
Added code in CommentListActivity to return an intent so that favorites
show up immediately after you have saved them
fixing dirty tree
Merge branch 'master' of
https://github.com/Mrbilec/CMPUT301W14T09-GPSForm.git

Conflicts:
	CMPUT301W14T09/gen/ca/cmput301w14t09/R.java
	CMPUT301W14T09/src/ca/cmput301w14t09/CommentListActivity.java
	CMPUT301W14T09/src/ca/cmput301w14t09/FavoriteActivity.java
	CMPUT301W14T09/src/ca/cmput301w14t09/TopCommentsActivity.java
fixing merge