Lava and Spike obstacles functional

Lava and spike obstacles are functional. Spikes art needs to be fixed so
it's background is transparent.
Merge branch 'Obstacles'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/theKristi/GameDev_spring14