・arrange_line.mdリリース
Merge branch 'master' of https://github.com/happyclam/happyclam.github.io
Conflicts:
	atom.xml
	rss.xml
	software/2014-10-04/arrange_line/index.html