change master file
new Branch, new commit
Reset Master
Merge branch 'ps177'

Conflicts:	myFile
Merge pull request #1 from scienceofthings/master

Merge ps177 into master