Merge branch 'master' of https://github.com/guts2014/a-goat-nae-pizza

Conflicts:
	src/com/agoatnaepizza/Game/Objects/Phone.java
	src/com/agoatnaepizza/GameLoop.java

Also added transparency.