edit user and project _form
edit report _form
edit application.haml
add welcome controller
add radius divs
add some styles
add social buttons
Merge branch 'make_up' into feature

Conflicts:
	app/assets/stylesheets/welcome.css.scss
	app/controllers/welcome_controller.rb
	app/controllers/welcome_controller.rb~
	app/models/project.rb~
	config/routes.rb
	config/routes.rb~
some adds
x
fix application.rb
no conflicts
some changes
new commit
add stages model
all
remove conflict
change routes
remove conflict
delete welcome.css.scss