Merge remote-tracking branch 'origin/master' into Nathalie
credits activity, delete button does something now.
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz'
Signal Beacon Custom View
possibly fixed the logo issue (on my end)
added branch?
Merge branch 'Alex_NoTouchiePlz'

Conflicts:
	.idea/libraries/support_v4_19_1_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/app.iml
Fixed errors caused by locationj refactoring
Beacon testr
Signal Beacon frame rate fixed
Biocalibrate skinning bug fixed
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz'

Conflicts:
	.idea/libraries/support_v4_20_0_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
BeaconWorking
Merge remote-tracking branch 'origin/Nathalie'

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

Conflicts:
	.idea/libraries/support_v13_20_0_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/StartScreen.java
	app/src/main/res/layout/activity_start_screen.xml
	app/src/main/res/values/strings.xml
NotWrkong
re-re-recreated branch
Stable with journal placeholder
Merge remote-tracking branch 'origin/master' into BranchFlakes
biolist
Greenie bluetooth work