modified:   app/controllers/spaces_controller.rb
	modified:   app/views/spaces/index.html.erb
	modified:   app/views/spaces/show.html.erb
	modified:   config/routes.rb
Merge branch 'master' of https://github.com/vike27/Angeldev7

Conflicts:
	app/views/spaces/index.html.erb
Merge branch 'master' of https://github.com/vike27/Angeldev7

Conflicts:
	app/controllers/spaces_controller.rb
Merge branch 'master' of https://github.com/vike27/Angeldev7

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

	modified:   Gemfile.lock
 	app/views/spaces/index.html.erb
Update Gemfile.lock for Heroku