un commit mas
Merge remote-tracking branch 'remotes/origin/master'
Merge remote-tracking branch 'origin/master'
logo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/assets/stylesheets/bootstrap-spacelab.css