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

Changes
Merge branch 'master' of https://github.com/KorySumsion/forever-planned