Merge pull request #29 from gnomicstudios/aranda

Heart mechanic and merges
Merge branch 'master' of https://github.com/gnomicstudios/GGJ13 into aranda
Updated background.. started unit lanes