Merge pull request #15 from shiyingzheng/master

A lot of stuff. Things work. Great!
adlkjfslkadf
Merge branch 'master' of https://github.com/benjaminpstern/AlphaBuild

Conflicts:
	Assets/Resources/LevelFiles/Scene12.txt.meta
	Assets/Resources/LevelFiles/Scene13.txt.meta
made helmets work
Merge remote-tracking branch 'upstream/master'
Mine bar lights up when player collects a mine