gitignore
Merge branch 'master' of github.com:vzvenyach/HRA

Conflicts:
	.gitignore
Merge branch 'master' of github.com:vzvenyach/HRA
added bootstrap functionality