jbangert Merge branch 'master' of github.com:jbangert/trapcc

Conflicts:
	trapcc/samples/kernel.o
	trapcc/samples_glider/kernel.o