kory's changes
Merge branch 'master' of https://github.com/KorySumsion/forever-planned