Test commit
Middleman init
Install bootstrap
Make environment
Delete files
Add upload
Merge branch 'master' of https://github.com/kikunantoka/docolla

Conflicts:
	source/javascripts/main.js
	source/layouts/layout.erb
	source/main.html.erb