Moved some stylesheets over to the base file

Scaffolds and Styles.css were conflicting. I put them under
/pulledcssfiles
Merge branch 'ryan'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/users_controller.rb