added a message for mike
changes made conflict resolved
Merge pull request #4 from malloryreuls/mallorysbranch

Mallorysbranch