made my dinosaur
Merge remote-tracking branch 'origin/master'

Conflicts:
	karel/KarelConundrum.java
	karel/package.bluej