Initial real commit
Merge branch 'master' of https://github.com/asciifaceman/voran

Merging upstream with the actual code