opcode input
Merge branch 'master' of github.com:xCaldazar/VOS-460

Conflicts:
	src/assembler/assembler.cpp