added corner merges
Merge branch 'master' of https://github.com/beersbr/ludum_dare_30