- try to commit
Merge branch 'master' of https://github.com/KanchoK/USI-Project

Conflicts:
	specification/srs_template.doc