Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014-v2

Conflicts:
Assets/Britt/spacestationtilesset2_1.png
Assets/Dante/level3.png.meta