changing stuff
Merge pull request #3 from abersager/branch1

changing stuff