biolist list
biolist list
biolist
biolist char names now populate
Merge remote-tracking branch 'origin/master' into BranchFlakes

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/JournalFragment/BioList.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/StartScreen.java
Starting on achievements
more biolist changes (still crashes)
biolist works
Merge remote-tracking branch 'origin/master' into Nathalie

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Tools.java
Merge remote-tracking branch 'origin/BranchFlakes'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/JournalFragment/BioList.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Tools.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/experience/gcCharacter.java
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Split
Torn up