Before pull
Merge branch 'asm' of github.com:ah450/RiSC-16-Simulator into asm

Conflicts:
	src/asm/regex/regex.cpp