Merge branch 'master' of /Users/bsmith/Documents/Projects/TCDisrupt with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartLocationNotifications/app/app.iml
who cares its 1 am