blah
Merge branch 'gh-pages' of https://github.com/nikkidahan/portfolio into gh-pages

Conflicts:
	home.html
	projects.html
	projects/confessions.html
	projects/hybrid.html
	projects/hybrid.html~
	stylesheets/stylesheet.css