test hogehgeo
テスト戻した
header color修正
css修正
test push
hogehogeとった
Merge branch 'feature/memoru' of github.com:es335ab/bootgraph into feature/memoru_css

Conflicts:
	memoru/public/css/style.css
	memoru/src/sass/_all.scss
jsファイルの修正をadd1
Merge branch 'feature/memoru' of github.com:es335ab/bootgraph into feature/memoru_css

Conflicts:
	memoru/public/css/style.css
	memoru/public/js/memoru.js
	memoru/public/js/memoru.min.js
js修正
Merge branch 'feature/memoru_css' of github.com:es335ab/bootgraph into feature/memoru