Renamed notes to reflect that it's written in markdown
Merge branch 'master' of github.com:kahbenya/kahbenya-kmail_dockmanager

Conflicts:
	note.md
	notes
	notes.md

Renamed to notes.md