fdsdsa
config
sasa
MAGIE
config update
merge
Merge branch 'master' of https://github.com/Oreoz/GTI619-Final

Conflicts:
	.classpath