Merge branch 'master' of https://github.com/mgosciniak/evolveapet

Conflicts:
	evolveapet/eap_frontend/Assets/Scenes/GenomeScene.unity
	evolveapet/eap_frontend/eap_frontend.userprefs
	evolveapet/eap_frontend/save.sav
Merge branch 'master' of https://github.com/mgosciniak/evolveapet