fixed untracked files
Merge branch 'master' of github.com:vi-s/myPortfolio

Conflicts:
	README.md
	app.js
	package.json