ERG_FIG
fig
Merge branch 'master' of https://github.com/grafgustav/FP2014-Dok-g1

Conflicts:
	core/main.py