new awesome changes

blah
Merge pull request #2 from nsanders1994/master

new awesome changes