lol it's all in one big commit!
Merge branch 'master' of github.com:cham/x-or-y