Added Bootstrap 3
Merge branch 'Bootstrap-3-sass' into User-skill-&-Bootstrap

Conflicts:
	log/development.log
	tmp/pids/server.pid