do something
Merge branch 'master' of https://github.com/asi1024/simpleArchitecture

Conflicts:
	src/Memory.v