testing conflict resolution
Merge branch 'development' of
https://github.com/CyberFreek/teamspacecat.git into development

Conflicts:
	SpaceCat/src/com/teamspacecat/spacecat/Bird.java