Initial commit with subscription app
Change gitignore
Merge branch 'master' of github.com:ha-D/shiva

Conflicts:
	.gitignore