First commit. Dirty
Merge http://github.com/eshiferax/code-in-a-box