Bootstrap inclusion 2.0
Merge branch 'master' of https://github.com/pablofullana/PersonalTrainer

Conflicts:
	app/views/home/index.html.erb