misc
Merge pull request #18 from ryanstorberg/master

misc
fix merge conflicts with working code
Merge branch 'CothOmega-master'