stuff
Merge branch 'master' of https://github.com/BlakJack/KTN-EDITS