first commit
create in html5 template
bootstrapのテンプレートを適用
フォント追加
個別用にカスタマイズ
個別用にカスタマイズ
Merge pull request #1 from yuuki-arc/create-design

サイトデザインを作成
add README.md
Replace master branch with page content via GitHub
middleman-deployを追加
Automated commit at 2014-08-12 18:05:29 UTC by middleman-deploy 0.2.4
Automated commit at 2014-08-12 19:25:01 UTC by middleman-deploy 0.2.4
Automated commit at 2014-08-13 00:43:03 UTC by middleman-deploy 0.2.4
masterを公開用のソースにする
Merge remote-tracking branch 'origin/master'

Conflicts:
	.htaccess
	404.html
	LICENSE.html
	README.html
	apple-touch-icon-114x114-precomposed.png
	apple-touch-icon-144x144-precomposed.png
	apple-touch-icon-57x57-precomposed.png
	apple-touch-icon-72x72-precomposed.png
	apple-touch-icon-precomposed.png
	apple-touch-icon.png
	crossdomain.xml
	css/animate.min.css
	css/blog.css
	css/bootstrap-theme.min.css
	css/bootstrap.min.css
	css/font-awesome.min.css
	css/main.css
	css/nivo-lightbox.min.css
	css/normalize.css
	css/theme.css
	css/yuukiarc.css
	favicon.ico
	fonts-theme/FontAwesome.otf
	fonts-theme/fontawesome-webfont.eot
	fonts-theme/fontawesome-webfont.svg
	fonts-theme/fontawesome-webfont.ttf
	fonts-theme/fontawesome-webfont.woff
	fonts/bootstrap/glyphicons-halflings-regular.eot
	fonts/bootstrap/glyphicons-halflings-regular.ttf
	fonts/bootstrap/glyphicons-halflings-regular.woff
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	humans.txt
	images/background.jpg
	images/background.png
	images/blog/avatar-2.jpg
	images/blog/avatar-3.jpg
	images/blog/mac.jpg
	images/blog/middleman.png
	images/blog/office-people.jpg
	images/blog/office.jpg
	images/browser-slider/652x340.gif
	images/browser-slider/browser.png
	images/features/blazing-fast.png
	images/features/pixel-perfect.png
	images/features/responsive.png
	images/imac-slider/514x275.gif
	images/imac-slider/imac.png
	images/iphone-bg.png
	images/logo.png
	images/middleman.png
	images/plugin-images/close.png
	images/plugin-images/close@2x.png
	images/plugin-images/loading.gif
	images/plugin-images/loading@2x.gif
	images/plugin-images/next.png
	images/plugin-images/next@2x.png
	images/plugin-images/prev.png
	images/plugin-images/prev@2x.png
	images/portfolio/1280x800.gif
	images/portfolio/400x300.gif
	images/team/team-1.jpg
	images/team/team-2.jpg
	images/team/team-3.png
	images/triangle.png
	img/bootstrap/glyphicons-halflings-regular.svg
	img/glyphicons-halflings-regular.svg
	index.html
	javascripts/all.js
	js/bootstrap.min.js
	js/call.js
	js/jquery.bxslider.min.js
	js/jquery.mixitup.min.js
	js/main.js
	js/nivo-lightbox.min.js
	js/plugins.js
	js/vendor/jquery-1.8.0.min.js
	js/vendor/modernizr-2.6.1.min.js
	js/wow.min.js
	robots.txt
	stylesheets/all.css
	stylesheets/application.css
	stylesheets/bootstrap-custom.css
	stylesheets/normalize.css
空ブランチからやり直し