Added a border with collisions to game
Merge commit 'fetch_head'