added a message for mike
Merge pull request #3 from malloryreuls/mike

mike made more changes
changes made conflict resolved
Merge pull request #4 from malloryreuls/mallorysbranch

Mallorysbranch
made some changes and added a line