update
update
Merge branch 'master' of https://github.com/angelaHan/portfolio

Conflicts:
	index.html
	static/css/main.css