jan i jego jaja
syf edycja developerska

Merge branch 'master' of https://github.com/Bartek347/Notepad

Conflicts:
	application/controllers/NoteController.php
	application/views/scripts/disp/index.phtml
	public/js/script.js