Added Benchmarking
Merge branch 'master' into develop

Conflicts:
	Makefile
	core/main.cpp