edited in dreamweaver
Merge branch 'master' of https://github.com/ssamukim/history

Conflicts:
	touch.txt
manual merge