close btn
Merge branch 'master' of https://github.com/jingaling/Portfolio

Conflicts:
	needs_to_be_fixed/work1.html