Merge branch 'master' of /Users/kevinharris/Documents/personalProject/SafetyStuffs with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml