dingen
Merge origin/master

Conflicts:
	Ludum Dare 28/public_html/js/entity.js
Merge origin/master

Conflicts:
	Ludum Dare 28/public_html/js/entity.js

Action messenger grotendeels gefixed
Merge origin/master

Conflicts:
	Ludum Dare 28/public_html/js/entity.js
	Ludum Dare 28/public_html/test.html