added post triplet
added factory girl
ooopppppppps
merge conflicts