Merge pull request #15 from cgoodling/master

?
Trying to get the changes to merge...?

Going to push my older file to the master.
Merge branch 'master' into new1
Merge branch 'new1'