Fixed all merges
Merge pull request #5 from csmalin/fix_all_of_the_merge_things

Fixed all merges