Modified test, this will cause a conflict
Merge branch 'master' of https://github.com/omarocegueda/anura

Conflicts:
	CMakeLists.txt