asdasd
Merge branch 'master' of https://github.com/alebian/TPE-EDA

Conflicts:
	bin/.gitignore
	bin/backend/MaxState.class
	bin/frontend/Main.class
	src/frontend/Main.java