trampolines
Merge branch 'master' of github.com:1337/yesterday-i-learned

Conflicts:
	javascript.md