Merge branch 'master' of https://github.com/SeanKSpr/Lost_Chronicle

Conflicts:

	Lost_Chronicle/gen/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/R.java

	Lost_Chronicle/src/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/EventListFragment.java

	Lost_Chronicle/src/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/RPG_Battle.java
Merge branch 'master' of https://github.com/SeanKSpr/Lost_Chronicle

Conflicts:
	Lost_Chronicle/src/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/Companion_Activity.java
	Lost_Chronicle/src/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/RPGSelectionScreen.java
	Lost_Chronicle/src/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/RPG_Battle.java