my init
Merge branch 'master' of github.com:solidco2/appmanager

Conflicts:
	.gitignore