Natural arithmetic!
Merge branch 'master' of https://github.com/charlesturner7c5/noah

Conflicts:
	headers/lex.hh