new change by bruch
chnge2 by bruch
Merge branch 'swapnote2'

Conflicts:
	swapskill_note.txt