The most work of the project
Merge branch 'master' of https://github.com/TeamDDA/DDA-Academy

Conflicts:
	DDA/DDA/scripts/renderer.js