fontawesome追加
asset pipelineを修正した

Merge branch 'template' of https://github.com/arupaka/sabatora_html into template

Conflicts:
	config.rb