Fixed memory files (mem.h/mem.cpp)
Merge branch 'master' of github.com:sparksalot/miNES

Conflicts:
	src/mem/mem.cpp
	src/mem/mem.h