Merge branch 'master' of https://github.com/mdeluca/unity_game

Conflicts:
livesPickup.js
lines