first line added
added line of code to bottom
fixed conflict
Merge pull request #5 from cstclair/master

Stuff