Style, first revision
Merge branch 'master' of github.com:JediSange/austindev