Getting close
Merge branch 'master' of github.com:johnathon101/project-workhang

Conflicts:
	db/seeds.rb