BossAnimations
Merge branch 'master' of https://github.com/acbui/gamerella2014

Conflicts: