Fix wall collision.
Merge branch 'prototype' of github.com:sconealone/ggj14 into prototype

Conflicts:
	index.html
	js/Level.js
	js/Player.js