Add new model: frog
move init steps from display.Display.__init__ to display.init
misc update.
Fix mirror disapearing bug.
resolve conflit.
Merge branch 'master' of github.com:ZhanruiLiang/mirrorman

Conflicts:
	main.py
	shapes.py
	sprites.py