merge
Merge branch 'master' of https://github.com/dominkomin/EnemyLines

Conflicts:
	src/EL.java
	src/EL.java.orig
tets