mbnmb
Merge branch 'master' of https://github.com/PUT-PTM/StarHunter

Conflicts:
	StarHunterSTM/StarHunter/StarHunter.sdf
	StarHunterSTM/StarHunter/StarHunter.v11.suo