change some files around
Merge pull request #2 from joh641/feature_changes

change some files around