いらないファイルの削除
Merge branch 'master' of github.com:od-/workshop

Conflicts:
	20141115/htdocs/_dev/files/_scss/_global_var.scss
	20141115/htdocs/_dev/files/_scss/_layout.scss
	20141115/htdocs/_dev/files/css/main.css