reset
Merge branch 'master' of https://github.com/engineacher/100m

Conflicts:
	.DS_Store
	cgi/.DS_Store