text box and terrible face
bad stuff
Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014-v2

Conflicts:
	Assets/Britt/chargebar.png.meta
Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014-v2