primer commit
Merge branch 'master' of github.com:Cazz/dev