commitando

Ass: suya
Merge branch 'master' of https://github.com/raffaelnagel/TrabalhoWEB

Conflicts:
	app/assets/stylesheets/projects.css.scss
	app/controllers/projects_controller.rb
	app/models/project.rb
	app/views/projects/edit.html.erb
	app/views/projects/index.html.erb
	app/views/projects/new.html.erb
	app/views/projects/show.html.erb
	db/development.sqlite3
	log/development.log
	test/fixtures/projects.yml