20140122ロゴの追加
Merge branch 'master' of git@github.com:heuris-taro/r_learning.git

Conflicts:
	app/assets/stylesheets/layout.css.scss