mod .gitignoe do not track DS_Store
かり
navigationの作成
Merge branch 'navigation'
Merge branch 'master' into view

Conflicts:
	coffee/styledocs.coffee
仮でbootstrapのデザインを当てる
Merge branch 'view'