Getting the environment, activemodel"
Before merge
Merge
Merge branch 'master' of github.com:TaiwoAyanleye/intern

Conflicts:
	Gemfile
	log/development.log
Resolving merge