idk whats going on
Merge branch 'master' of https://github.com/nuxe/Recruiting

Conflicts:
	db/schema.rb