153 Add merge conflict
Prior to this commit things were ok. This commit creates conflict.
Merge pull request #26 from ajroetker/feature/my_email/153_merge_conflit_test

153 Add merge conflict