(bug) creating merge conflict
(feat) dd2 -- italisized the name of the book that the quote that came from
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
Merge pull request #15 from davidderiso/feat/dd2

Feat/dd2 - Resolve merge conflict
(conflict) test conflict
(bug) practicing merge conflict
Merge pull request #16 from celineotter/addConflict2

(bug) practicing merge 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