first edit
Merge pull request #1 from ScottBeatson/master

first edit