modified:   Apache2_modoki.html
	modified:   README.md
	modified:   without_js.patch
Merge branch 'master' of https://github.com/sasairc/Tumblr_my_Layout

Conflicts:
	README.md

	modified:   README.md