Tanq
Merge branch 'master' of https://github.com/freak1n/SRE-Course

Conflicts:
	TabletChoice.ucd
	TabletChoice.ucd.autosave