ting
Merge branch 'master' of https://github.com/vegaholt/AI-PSO

Conflicts:
	PSOMainUI/PSOMainUI.iml