no message
Merge branch 'master' of https://github.com/SThou/VisualExerciser into STEdits

* 'master' of https://github.com/SThou/VisualExerciser:
  no message
  no message
  branch test

Conflicts:
	test.txt
Clean Up
Merge branch 'STEdits' of https://github.com/SThou/VisualExerciser into HKEdits

Conflicts:
	test.txt
	test_5.txt