testing :
notes
Merge branch 'master' of https://github.com/conorgilmer/me into dev

Conflicts:
	notes.txt