commiting some changes
Merge branch 'master' of https://github.com/zerasul/sac_1.1.git
Merge branch 'master' of https://github.com/zerasul/sac_1.1.git

Conflicts:
	SAC_1.1/SAC_1.1.cpp