Fixed bugs in the info text.

Gosh I'm so sabaw na...
Fixed conflicts.
uh...
Merge branch 'master' of https://github.com/darrensapalo/bad-vibes

Conflicts:
	bad-vibes-game/src/com/mobi/badvibes/model/world/World.java
	bad-vibes-game/src/com/mobi/badvibes/nimators/WorldRendererAccessor.java
	bad-vibes-game/src/com/mobi/badvibes/view/WorldRenderer.java