First commit
Merge branch 'master' of github.com:frma71/sbs

Conflicts:
	.gitignore