Awesome commit
pushing to pull
conflict merge
Merge pull request #13 from jpsiepert/master

Changes