credits activity, delete button does something now.
possibly fixed the logo issue (on my end)
added branch?
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