new
Merge branch 'master' of https://github.com/HealthyWay/yoshinkan_markup

Conflicts:
	css/style.css
	images/nagano/.DS_Store
	images/nagano1/.DS_Store
	images/red/.DS_Store