solve git conflict
readd utils.cpp
fix conflict: done
Merge branch 'master' of github.com:ltlollo/invert-sfml

Conflicts:
	src/utils.cpp
fix conflict