About to be reverted
And reverting.
Revert "About to be reverted"

This reverts commit 6994500dafcff4740919e74c803e413dab2aae2c.
Merge branch 'master' of github.com:tehmatt/Chankillo
minor change to the order of history.
Merged successfully.