Initial commit
Merge branch 'master' of erasaur.github.com:erasaur/octagon