Added fire pidgeon
Added fire pidgeon
Merge branch 'master' of https://github.com/GameBuilders/student-gdc-2014

Conflicts:
	level.py
Merge branch 'master' of https://github.com/GameBuilders/student-gdc-2014

Conflicts:
	level.py