Merge pull request #7 from riszw/gh-pages

favicon
Merge pull request #8 from riszw/gh-pages

favicon 表示する部分追加
new design. by opusinfotech.in
change image
目分量でFacebookのボタンを変更
Merge pull request #13 from ukstudio/trashkids-facebook

目分量でFacebookのボタンを変更
fix typo
Fixes #10
Fixes #11
デザインを画像のやつに近づけた
いいね！ボタンの位置を変更
Fusion of a logo and a photograph
Merge branch 'improve-design' of git://github.com/mashiro/fcrockstar.com into mashiro-improve-design

Conflicts:
	css/style.css
Merge branch 'change_cover_image' of git://github.com/HolyGrail/fcrockstar.com into HolyGrail-change_cover_image

Conflicts:
	index.html
Fix conflict
Improved indentation