putchar
Merge branch 'master' of https://github.com/starfox644/jjcgm2014B

Conflicts:
	nachos/test/putchar.c