Trampoline finished
Merge branch 'master' of https://github.com/bjh83/hermes

Conflicts:
	interpreter.c
	trampoline.c
	trampoline.h