Styling
Merge branch 'master' of github.com:willmitchill/helpout

Conflicts:
	app/views/project_profile.erb
	app/views/user_profile.erb
	db/db.sqlite3
styling sunday 3:40