changin the .rvmrc file
Merge branch 'sprint1' of https://github.com/mdalberto/lynda-cms into sprint1

Conflicts:
	.rvmrc
adding bootstrap
renaming application.html.erb