Start port to run on Mac
Merge branch 'master' into mac_update

Conflicts:
	assembler.cpp
	emulator.cpp
	include/constants.h
	include/emulator.h
Compiles on mac
Merge branch 'debugger' into mac_update

Conflicts:
	emulator.cpp
Changed style