old version
Merge branch 'dev' of https://github.com/feelos0ff/targetmaker into dev

Conflicts:
	graph/__init__.py
update architecture