adding mike's conflict
update conflict
Merge pull request #4 from michaeltirenin/master

Jeff/Mike Conflict