Merge branch 'feature/14-factory-girl' into feature/1-remaining-specs
Merge branch 'feature/14-factory-girl' into feature/1-remaining-specs
resolved broken specs
Merge branch 'feature/1-remaining-specs'

Conflicts:
	Gemfile
removed Mail gem
ran bundle to remove confilcts
deleted gemfile.lock, rre-ran bundle due to conflicts