ERRORS EVERYWHERE
Merge branch 'GUI' of https://github.com/joelolofsson/DAT096 into GUI

Conflicts:
	Interface/DataStrLeon2.pyc