Merge branch 'dev' into yar
end day, work in progress
careers, in progress
end day, test resumes in progress
tests for post_view + minitest_helper fixes + contact_view_test fixes
Merge pull request #67 from is-valid/637-Feature

tests for post_view + minitest_helper fixes + contact_view_test fixes
end day, careers and test almost ready
Merge branch 'dev' into 637-Feature
finish way careers
merge with dev
fix
Merge pull request #68 from is-valid/674_yar

674 yar
Seeds.rb creating all types of models but TEAM
Merge branch 'dev' into 637-Feature
Merge pull request #69 from is-valid/637-Feature

637 feature
fixed conflicts