A few changes before pull
Merge branch 'master' of github.com:SalamiCo/PEvol

Conflicts:
	src/pe1314/g11/gui/MainFrame.java
Things