resume
Merge branch 'master' of https://github.com/zendad/zendad.github.io

Conflicts:
	README.md
	css/style.css
	index.html