(conflict) test conflict
Merge branch 'master' of https://github.com/pitchperfect/ipitchperfect into conflict/cg1

Conflicts:
	client/app/main/main.html
Merge pull request #17 from areagray/conflict/cg1

Conflict/cg1