Add factory girl.
Merge branch 'master' of https://github.com/loveltyoic/inner_message

Conflicts:
	Gemfile