modified:   README.md
Merge branch 'gh-pages' of https://github.com/skarred/resume into gh-pages

Conflicts:
	README.md
	index.html
	stylesheets/stylesheet.css

	modified:   README.md
	modified:   index.html
	modified:   params.json
	new file:   smk-cv.pdf
	deleted:    stylesheets/stylesheet.css