didn't intend to push the last one to master
Merge branch 'master' of github.com:coldwaterq/want2hack