fixed tabs and added make
Merge branch 'master' of https://github.com/16candles/16candles
and Names.

Conflicts:
	src/compiler/arch.h