cutscene 2
Merge branch 'master' of https://github.com/bgirard/ToJAM2013

Conflicts:
	intro.html
updated mock2
Merge branch 'master' of https://github.com/bgirard/ToJAM2013