pulling
fixed conflicts
Merge pull request #49 from wgallop99/master

pulling