commit 1.1
Merge github.com:dimonwarm/resume

Conflicts:
	resume.css
	resume.html