1st Productions versions of POP
Merge branch 'master' of https://github.com/kylevalenzuela/Portfolio-2014

Conflicts:
	.sass-cache/45089ad6d7855ef69d13765dc640427f250847b7/style.scssc
	.sass-cache/a38cefd05a90ef3156e19e53cd9213c3b9e6f226/style.scssc
	404.php
	archive.php
	footer.php
	functions.php
	header.php
	home.php
	icomoon-webfont.eot
	icomoon-webfont.svg
	icomoon-webfont.ttf
	icomoon-webfont.woff
	images/grid.png
	images/me.png
	inc/meta.php
	js/myjquery-ck.js
	js/myjquery.js
	page-bloghome.php
	page-portfolio-loop.php
	page-portfolio.php
	screenshot.png
	scss/style.scss
	single.php
	style.css

I hope I don't ruin this repo