structure
quick first structure
structure
structure
structure
Merge branch 'master' of https://github.com/mo-zo/Projekt-Pikachu.git
push
Merge branch 'master' of https://github.com/mo-zo/Projekt-Pikachu.git

Conflicts:
	projekt-pikachu/src/main/java/org/petsim/view/PetSim.java
encoding
Merge branch 'master' of https://github.com/mo-zo/Projekt-Pikachu