Some Changes
added some javadoc
Awesome changes
changed some images
added an image
Hamster Changes :) because I'm awesome :3
Fixed some Conflicts, added some Images :3
Merge branch 'master' of https://github.com/V1del/ohsom

Conflicts:
	Ohsom/src/bo/Tamagotchi.java
	Ohsom/src/gui/TamagotchiGUI.java


Signed-off-by: = <natalie@judosch.ch>