Small fixes
Merge branch 'master' of github.com:Plankton555/SOCS_project

Conflicts:
	Main.m