testing changes
Merge branch 'master' of github.com:DropD/fnc-simplex

Conflicts:
	src/main.cpp