Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'master' and 'master' of https://github.com/ericye16/honey
Now stripping points so feelings aren't hurt