Initial commit
Merge branch 'master' of github.com:Shazburg/dev