Get people and locations
Merge branch 'master' of https://github.com/maguire0/git-repo.git
more
Merge branch 'master' of https://github.com/maguire0/git-repo.git

Conflicts:
	NewsHackProject/grails-app/views/sample/index.gsp
Merge branch 'master' of https://github.com/maguire0/git-repo