initial commit
Merge branch 'master' of http://github.com/n3ocort3x/n3oOne