removes merges conflict lines and stephen's comments
Merge pull request #3 from evansimoni/evan

removes merges conflict lines and stephen's comments