More work
Merge branch 'master' of https://github.com/grantmcd/portfolioProject

Conflicts:
	index.html
Merge branch 'master' of https://github.com/grantmcd/portfolioProject

Conflicts:
	scripts/rasaMath.js