learning how to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
learned how to merge