added stuff
Merge branch 'master' of https://github.com/coreyor/hack-plus into coreyor-master
Merge branch 'coreyor-master'