first commit
changed style
Merge branch 'master' of github.com:jgab-net/siplik_frontend

Conflicts:
	.gitignore