asile samurai
Merge branch 'master' of github.com:oogushitakuya/2014_03_intern_mem

Conflicts:
	TESTAKAIKE