the return of triangle waves
Merge branch 'master' of https://github.com/alzwded/JakVM

Conflicts:
	doc/MEMORY.md