pc update 18:49
Merge branch 'master' of https://github.com/coenraadv/SimpleFeedback

Conflicts:
	relase_note2.txt