re-re-recreated branch
Merge remote-tracking branch 'origin/master' into BranchFlakes
biolist
Greenie bluetooth work
redoing file download and unzip logic, finished delete button and added it to the journal fragment.
added biolist layout
made biolist scrollable, BUT THE TOOLS MENU GETS ACTIVATED. WHY DANTE?
Merge remote-tracking branch 'origin/BranchFlakes'

Conflicts:
	.idea/libraries/play_services_5_0_77.xml
	.idea/libraries/support_v13_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Merge remote-tracking branch 'origin/BranchFlakes'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Three bluetooth graphs initial
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	.idea/libraries/support_v13_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
biolist stuff
Start off for amplifier sounds
tool tester
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/Tools/Tester.java
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Unworking-MidRefactor.