Initial commit
.gitignore added
Merge branch 'master' of https://github.com/Matesburg/SNT_app
	Resolved conflicts
Conflicts:
	.gitignore