CSSæ荞Ý
æ荞Ý
Merge branch 'master' of https://github.com/cfcw/cakes

Conflicts:
	html/assets/css/bootstrap.css

make capistrano files.
Add Capfile.
Merge branch 'master' of https://github.com/cfcw/cakes