123
Merge branch 'master' of https://github.com/popacai/Measure

Conflicts:
	memory/l1
	memory/l2
	memory/mem