change freelance to contract, added email marketing
change freelance to contract, added email marketing
Merge branch 'master' of https://github.com/jpostdesign/bootstrap_portfolio

 Please enter a commit message to explain why this merge is necessary,
git pull origin master to solve Your branch and 'origin/master' have diverged
test commit message