Started working on an improvement on how the game ends
Merge branch 'master' of github.com:Kyrremann/eyeCatcher

Conflicts:
	src/no/minimon/eyecatch/game/EyeCatchGameActivity.java
Added meld files to gitignore