test conflicts
Adding contact form plugin
Nothin doin'
Merge branch 'master' into test
Merge pull request #1 from daniel-pacecreative/test

Test