added oxygen, not effecting player oxygen yet though
Merge branch 'master' of https://github.com/sposterkil/eecs290fps
Merge branch 'master' of https://github.com/sposterkil/eecs290fps

Conflicts:
	Assets/Grid Scripts/GridCreator.cs