ugly portfolio
Merge branch 'master' of github.com:vi-s/myPortfolio

Conflicts:
	.gitignore
	README.md