Memory test, works
Merge branch 'Juanjbb' of https://github.com/technik/arion into Juanjbb

Conflicts:
	src/code/main.cpp