put picture.png back in
put picture.png in
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga

Conflicts:
	src/vooga/towerdefense/action/InfoBridge.java