remove factory_girls_rails, it messes up factory_girl sequences
more ignoring
Merge branch 'repair'
Merge commit '5f9f663b37bcb4a624f85f1e68626823e7197455' into repair
don't need faker gem
require factories in article steps
revert factories
Merge branch 'repair'
Merge commit '73770779a6b76683c476228006808cf36c10459d' into repair
ignoring ckeditor
Merge commit '9aca22fa6c51443d549387495bbd5c4548bc7d64' into repair
rename form fields from merge_this to merge_with
Merge commit 'b18f153b01f36a375e8f52ccea0c4024e3ee1711' into repair
merging commit 1745620defbd80e32262ce2554f9184a94cfe08e
merging commit 1745620defbd80e32262ce2554f9184a94cfe08e
remove attr_accessor, it messes things up
Merge branch 'repair'
working controller spec for merge