Fix typos
Merge branch 'master' into fix_develope_typo

Conflicts:
	2014/partials/home.html
Merge pull request #6 from alsutton/fix_develope_typo

Fix typos