(bug) practicing merge conflict
Merge pull request #16 from celineotter/addConflict2

(bug) practicing merge conflict