bar on about
Merge branch 'master' of https://github.com/groupthat/GroupThat

Conflicts:
	.DS_Store