Update Bird.java

added a comment for testing
Updated pictures, fixed pause button, removed "ready" screen.
Corrected collision detection parameters around character
Fix typo in enemy.jar
test
added menutest
deleted test file
added some comments
Update Bird.java
testing conflict resolution
Merge branch 'development' of
https://github.com/CyberFreek/teamspacecat.git into development

Conflicts:
	SpaceCat/src/com/teamspacecat/spacecat/Bird.java
Update Bird.java
added a test comment
Merge branch 'development' of
https://github.com/CyberFreek/teamspacecat.git into development

Conflicts:
	SpaceCat/src/com/teamspacecat/spacecat/Bird.java
Update Bird.java
test
Merge branch 'development' of
https://github.com/CyberFreek/teamspacecat.git into development

Conflicts:
	SpaceCat/src/com/teamspacecat/spacecat/Bird.java
added some comments
Karen modified all files related to graphics. Renamed "Dog" to "Fish"
Changed user to "character, character2, character3", added water tile,
changed enemy to "bird".  Messing with mapping layout.