Just a commit.
Added a new note
Added the master change
added the dev change
Merge branch 'dev'

Conflicts:
	index.php