intro effects
Merge branch 'master' of github.com:bgirard/ToJAM2013

Conflicts:
	intro.html
badass intro
Merge branch 'master' of github.com:bgirard/ToJAM2013