add disco modus animation
Merge branch 'master' of github.com:kollektivpp/GoogleDevFest2013

Conflicts:
	css/main.scss
Merge branch 'master' of github.com:kollektivpp/GoogleDevFest2013