Made some live fixes

Made some live fixes. Need to put all the CSS in a single file
Merge branch 'master' of https://github.com/clane/newPortfolio

Conflicts:
	css/main.css