Fixed up the init process
Merge branch 'master' of github.com:bericp1/skeleton