Cambiar el diseño de bootstrap
Merge branch 'master' of github.com:garagelab/SMA

Conflicts:
	public/css/styles.css
	views/index.erb
	views/layout.erb