MAN MODE; obstacles fade out & disappear
Fixed to obstacle fade-out
Merge commit '258e07e1df478a6f2da2b7a894374e55b173e4c3' into aaron_mac

Conflicts:
	src/ObstacleGenerator.cpp
Two/Four player select
Merge commit '57ab17ae30eaf837ed4caabec577c26a7e813110' into dylan
added ability to spin blocks. added level 3 xml, took out some logs. hello mother.