Update
fixed conflict
Merge pull request #3 from mattdalton1/master

Update