Initial commit II
Merge branch 'master' of github.com:Antaranian/nocracy