Merge pull request #2 from evansimoni/evan

evan's commit message
change those lines
removes merges conflict lines and stephen's comments