update
Merge branch 'master' of https://github.com/Hypno73/MyList

Conflicts:
	Mylist.xml