idk if I'm on the right path....haha, get it?
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties