added bootstrap
Bootstrap styling
Merge branch '{welcome_page}' of github.com:ronnieVoice/wikiful into {welcome_page}

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
Merge branch '{welcome_page}'
merge branches