(bug) creating merge conflict
Merge pull request #13 from celineotter/addConflict

(bug) creating merge conflict
Merge branch 'master' of https://github.com/pitchperfect/ipitchperfect into feat/dd2

Conflicts:
	client/app/main/main.html