plenty of stuff changed. can't even remember what it all was.
Merge branch 'master' of github.com:clone1018/Shocky
wtf?