Fixed dependancies
Merge branch 'dev' of git:notepad

Conflicts:
	src/css/main.css
	src/js/buttons.js
	src/js/listeners.js