Update
Merge branch 'master' of github.com:AdaRoseEdwards/PortfolioTest

Conflicts:
	package.json
	routes/index.js