added settings and checkin files
Merge branch 'master' of https://github.com/madpatter/introHCI

Conflicts:
	checkin.html
Merge branch 'master' of https://github.com/madpatter/introHCI

Conflicts:
	checkin.html