Added CNAME record for github-pages
Changed site layout and removed CNAME
Removed CNAME record so the site doesn't publish
Merge branch 'master' into gh-pages

Conflicts:
	_site/README.md
	_site/css/julie.css
Merge branch 'master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Add Portfolio to navbar

Added portfolio to the navbar as a dropdown.
Added CNAME record for github-pages
Updated gitignore
Merge branch 'gh-pages'