added barrier up/down animation
Merge branch 'master' of https://github.com/newmanwillis/Dead_Week

Conflicts:
	Assets/-tk2d.asset
buttons now show that they have been turned on
Merge branch 'master' of https://github.com/newmanwillis/Dead_Week

Conflicts:
	Assets/-tk2d.asset
Merge branch 'master' of https://github.com/newmanwillis/Dead_Week

Conflicts:
	Assets/-tk2d.asset