Merge branch 'dev'
Merge branch 'dev'
Updated CV page to match source .docx document. Restyled the print stylesheet, too, so that it automatically prints looking vaguely like the DOCX/PDF versions.
Merge branch 'dev'
Reformatted code.
Tidied up portfolio images folder & code that references those images.
Tried to indicate on the portfolio page which employer each project relates to.
Replaced the portfolio sites' list of technologies with an *actual* UL list but styled inline. Lets me apply a white-space:nowrap; style to each LI, as well as being somewhat more semantic.
Tidied portfolio screenshot code. Yay procrastination!
Portfolio screenshot placeholders.
Added placeholder messages to portfolio.
Bit more portfolio writing.
Merge remote-tracking branch 'hat-private/master' into dev

Conflicts:
	application/views/scripts/portfolio/index.phtml