Matt commit
Merge branch 'master' of github.com:szarmes/448Project

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/static_pages_controller.rb
	app/helpers/application_helper.rb
	app/helpers/contact_helper.rb
	app/helpers/sessions_helper.rb
	app/helpers/static_pages_helper.rb
	app/helpers/uploads_helper.rb
	app/helpers/users_helper.rb
	app/models/experience.rb
	app/models/keyword.rb
	app/models/posting.rb
	app/models/reference.rb
	app/models/requirement.rb
	app/models/skill.rb
	config/routes.rb
	spec/factories/experiences.rb
	spec/factories/keywords.rb
	spec/factories/postings.rb
	spec/factories/reference.rb
	spec/factories/requirements.rb
	spec/factories/skills.rb
	spec/models/experience_spec.rb
	spec/models/keyword_spec.rb
	spec/models/posting_spec.rb
	spec/models/reference_spec.rb
	spec/models/requirement_spec.rb
	spec/models/skill_spec.rb