Merge branch 'master' of
https://github.com/hugokallstrom/Disassembler.git

Conflicts:
	src/main/MnomicFormat.java
hk
Merge branch 'master' of https://github.com/hugokallstrom/Disassembler.git
hk