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

Conflicts:
	resume.md