メイキング画像を適用
Added memo.txt
Merge branch 'master' of github.com:shuji615/seisakuten2014

Conflicts:
	web/img/making/making1.jpg
	web/img/making/making2.jpg
	web/img/making/making3.jpg
	web/img/making/making4.jpg