mac changes
Merge branch 'master' of https://github.com/jwesty52/UmassApp

Conflicts:
	UmassProto/.idea/workspace.xml