messed up version
Merge remote-tracking branch 'HypeSwipe/master'
khj