Mini fix in README
Bootstrap 3.0.1 migration
Merge branch 'master' of github.com:francocatena/x0y0
Merge ../x0y0

Conflicts:
	README.rdoc