todo is closer to functioning
Merge branch 'master' of https://github.com/KorySumsion/forever-planned
Merge branch 'master' of https://github.com/KorySumsion/forever-planned
krissy's stuffs
Merge pull request #30 from MarkTonkinson/master

To do almost functioning