Bouncing
Merge branch 'master' of https://github.com/laverick/Festival

Conflicts:
	FestivalPrototype/User.m