font added
Merge branch 'master' into change_font

Conflicts:
	public/assets/manifest-507d3955df1ebff9564cb5d56c13634b.json
	public/assets/schedule-3fe741fe8d884184c8d7fceb935331d9.js.gz
vertical-timeline's bug fix
Merge pull request #23 from katsuhide/change_font

Change font
Merge branch 'master' into feature/rails-event-model

Conflicts:
	public/assets/manifest-507d3955df1ebff9564cb5d56c13634b.json