minor changes
merge conflict fixes
Merge pull request #28 from jpsiepert/master

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