Initial commit
Merge branch 'master' of github.com:joshharbaugh/pixelhaven-wp-theme

Conflicts:
	404.php
	archive.php
	assets/css/handheld.css
	assets/css/print.css
	assets/css/style.css
	assets/fonts/trumpgoteasmed-webfont.eot
	assets/fonts/trumpgoteasmed-webfont.svg
	assets/fonts/trumpgoteasmed-webfont.ttf
	assets/fonts/trumpgoteasmed-webfont.woff
	assets/js/html5.js
	assets/js/jquery-animate-css-rotate-scale.js
	assets/js/jquery-ui-1.8.1.custom.min.js
	assets/js/jquery.easing.min.js
	assets/js/jquery.isotope.min.js
	assets/js/jquery.lazyload.js
	assets/js/jquery.quicksand.js
	assets/js/libs/dd_belatedpng.js
	assets/js/libs/jquery-1.5.1.js
	assets/js/libs/jquery-1.5.1.min.js
	assets/js/libs/modernizr-1.7.min.js
	assets/js/modernizr.custom.85112.js
	assets/js/modernizr.custom.js
	assets/js/mylibs/.gitignore
	assets/js/plugins.js
	assets/js/prettyphoto.min.jquery.js
	assets/js/script.js
	assets/js/showcase.js
	assets/js/slides.min.jquery.js
	assets/js/superfish.js
	assets/js/theme_contact.js
	assets/js/twitter.load.min.js
	attachment.php
	author.php
	category.php
	comments.php
	css/base.css
	css/handheld.css
	css/main.css
	css/mobile.css
	css/print.css
	css/reset.css
	editor-style-rtl.css
	editor-style.css
	fonts/Clarendon FS/Clarendon-Bold.otf
	fonts/Clarendon FS/Clarendon-BoldExpanded.otf
	fonts/Clarendon FS/Clarendon-Light.otf
	fonts/Clarendon FS/Clarendon-Medium.otf
	fonts/Clarendon FS/Clarendon-Xbold.otf
	fonts/Clarendon FS/License.txt
	fonts/Clarendon FS/web fonts/@Font-Face License.txt
	fonts/Clarendon FS/web fonts/clarendonfs_bold_macroman/Clarendon-Bold-webfont.svg
	fonts/Clarendon FS/web fonts/clarendonfs_bold_macroman/Clarendon-Bold-webfont.woff
	fonts/Clarendon FS/web fonts/clarendonfs_bold_macroman/Extras/Clarendon-Bold-webfont.svgz
	fonts/Clarendon FS/web fonts/clarendonfs_bold_macroman/Extras/alt_base64_stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_bold_macroman/demo.html
	fonts/Clarendon FS/web fonts/clarendonfs_bold_macroman/stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_boldexpanded_macroman/Clarendon-BoldExpanded-webfont.eot
	fonts/Clarendon FS/web fonts/clarendonfs_boldexpanded_macroman/Clarendon-BoldExpanded-webfont.svg
	fonts/Clarendon FS/web fonts/clarendonfs_boldexpanded_macroman/Clarendon-BoldExpanded-webfont.ttf
	fonts/Clarendon FS/web fonts/clarendonfs_boldexpanded_macroman/Clarendon-BoldExpanded-webfont.woff
	fonts/Clarendon FS/web fonts/clarendonfs_boldexpanded_macroman/Extras/Clarendon-BoldExpanded-webfont.svgz
	fonts/Clarendon FS/web fonts/clarendonfs_boldexpanded_macroman/Extras/alt_base64_stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_boldexpanded_macroman/demo.html
	fonts/Clarendon FS/web fonts/clarendonfs_boldexpanded_macroman/stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_extrabold_macroman/Clarendon-Xbold-webfont.eot
	fonts/Clarendon FS/web fonts/clarendonfs_extrabold_macroman/Clarendon-Xbold-webfont.svg
	fonts/Clarendon FS/web fonts/clarendonfs_extrabold_macroman/Clarendon-Xbold-webfont.ttf
	fonts/Clarendon FS/web fonts/clarendonfs_extrabold_macroman/Clarendon-Xbold-webfont.woff
	fonts/Clarendon FS/web fonts/clarendonfs_extrabold_macroman/Extras/Clarendon-Xbold-webfont.svgz
	fonts/Clarendon FS/web fonts/clarendonfs_extrabold_macroman/Extras/alt_base64_stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_extrabold_macroman/demo.html
	fonts/Clarendon FS/web fonts/clarendonfs_extrabold_macroman/stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_light_macroman/Clarendon-Light-webfont.svg
	fonts/Clarendon FS/web fonts/clarendonfs_light_macroman/Clarendon-Light-webfont.woff
	fonts/Clarendon FS/web fonts/clarendonfs_light_macroman/Extras/Clarendon-Light-webfont.svgz
	fonts/Clarendon FS/web fonts/clarendonfs_light_macroman/Extras/alt_base64_stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_light_macroman/demo.html
	fonts/Clarendon FS/web fonts/clarendonfs_light_macroman/stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_medium_macroman/Clarendon-Medium-webfont.eot
	fonts/Clarendon FS/web fonts/clarendonfs_medium_macroman/Clarendon-Medium-webfont.svg
	fonts/Clarendon FS/web fonts/clarendonfs_medium_macroman/Clarendon-Medium-webfont.ttf
	fonts/Clarendon FS/web fonts/clarendonfs_medium_macroman/Clarendon-Medium-webfont.woff
	fonts/Clarendon FS/web fonts/clarendonfs_medium_macroman/Extras/Clarendon-Medium-webfont.svgz
	fonts/Clarendon FS/web fonts/clarendonfs_medium_macroman/Extras/alt_base64_stylesheet.css
	fonts/Clarendon FS/web fonts/clarendonfs_medium_macroman/demo.html
	fonts/Clarendon FS/web fonts/clarendonfs_medium_macroman/stylesheet.css
	fonts/clarendon-bold.eot
	fonts/clarendon-bold.ttf
	fonts/clarendon-light.eot
	fonts/clarendon-light.ttf
	fonts/trumpgoteasmed-webfont.eot
	fonts/trumpgoteasmed-webfont.svg
	fonts/trumpgoteasmed-webfont.ttf
	fonts/trumpgoteasmed-webfont.woff
	footer.php
	functions.php
	functions/admin-helper.php
	functions/ajax-image.php
	functions/comment-list.php
	functions/css/Thumbs.db
	functions/css/admin.css
	functions/css/checkbox.css
	functions/css/empty.png
	functions/custom-functions.php
	functions/generate-meta-box.php
	functions/generate-options.php
	functions/generate-slider.php
	functions/img/icon.png
	functions/img/logo.png
	functions/img/sprite.png
	functions/include-meta-boxes.php
	functions/include-options.php
	functions/meta-boxes/post-image.php
	functions/meta-boxes/project-link.php
	functions/options/blog-options.php
	functions/options/footer-options.php
	functions/options/general-options.php
	functions/options/homepage-options.php
	functions/options/integrate-options.php
	functions/options/slider-settings.php
	functions/register-widgets.php
	functions/register-wp3.php
	functions/scripts/ajaxupload.js
	functions/scripts/jquery.checkbox.min.js
	functions/scripts/prettyPhoto/README
	functions/scripts/prettyPhoto/css/prettyPhoto.css
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_square/loader.gif
	functions/scripts/prettyPhoto/images/prettyPhoto/dark_square/sprite.png
	functions/scripts/prettyPhoto/images/prettyPhoto/facebook/btnNext.png
	functions/scripts/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png
	functions/scripts/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png
	functions/scripts/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png
	functions/scripts/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png
	functions/scripts/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png
	functions/scripts/prettyPhoto/images/prettyPhoto/facebook/loader.gif
	functions/scripts/prettyPhoto/images/prettyPhoto/facebook/sprite.png
	functions/scripts/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png
	functions/scripts/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png
	functions/scripts/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif
	functions/scripts/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png
	functions/scripts/prettyPhoto/images/prettyPhoto/light_square/btnNext.png
	functions/scripts/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png
	functions/scripts/prettyPhoto/images/prettyPhoto/light_square/loader.gif
	functions/scripts/prettyPhoto/images/prettyPhoto/light_square/sprite.png
	functions/scripts/prettyPhoto/js/jquery.prettyPhoto.js
	functions/scripts/rotator.js
	functions/shortcodes.php
	header.php
	home.php
	images/Thumbs.db
	images/amanda-harbaugh-blog.jpg
	images/apple-touch-icon.png
	images/arrow-left.png
	images/arrow-right.png
	images/arrow-up.png
	images/article_1_thumbnail.jpg
	images/article_1_thumbnail.png
	images/article_2_thumbnail.jpg
	images/article_2_thumbnail.png
	images/article_3_thumbnail.jpg
	images/article_3_thumbnail.png
	images/button_black.png
	images/button_white.png
	images/delicious_icon.gif
	images/designing-for-theme.jpg
	images/facebook_icon.gif
	images/fold.gif
	images/footer-logo.jpg
	images/header_bg.gif
	images/header_bg.jpg
	images/header_highlight.jpg
	images/header_highlight.png
	images/icons.jpg
	images/logo.gif
	images/nav_bg.jpg
	images/navigation.png
	images/read_the_journal_title.jpg
	images/recent_work_title.jpg
	images/request_button.gif
	images/rss_icon.gif
	images/section_gradient.jpg
	images/section_shadow.jpg
	images/separator.gif
	images/service-icons.gif
	images/slide.jpg
	images/slide.png
	images/social-icons-hover.jpg
	images/social-icons.jpg
	images/spacer.gif
	images/stockmarkup-website.jpg
	images/thumb_dream_big_design_small.jpg
	images/twitter.gif
	images/twitter_icon.gif
	images/under_construction.gif
	images/vladimir-website.jpg
	images/wordpress.png
	images/zoom.gif
	images/zoom.png
	includes/OAuthSimple.php
	includes/goodreads.class.php
	includes/lastfm.class.php
	includes/netflix.class.php
	index.php
	js/Clarendon.font.js
	js/cufon-yui.js
	js/jquery-animate-css-rotate-scale.js
	js/jquery.quicksand.js
	js/lastfm.api.cache.js
	js/lastfm.api.js
	js/lastfm.api.md5.js
	js/libs/dd_belatedpng.js
	js/libs/jquery-1.4.2.js
	js/libs/jquery-1.4.2.min.js
	js/libs/jquery.easing.js
	js/libs/modernizr-1.6.min.js
	js/libs/modernizr.custom.js
	js/mylibs/.gitignore
	js/plugins.js
	js/profiling/charts.swf
	js/profiling/config.js
	js/profiling/yahoo-profiling.css
	js/profiling/yahoo-profiling.min.js
	js/script.js
	languages/twentyten.pot
	license.txt
	loop-attachment.php
	loop-author.php
	loop-page.php
	loop-portfolio.php
	loop-single.php
	loop.php
	onecolumn-page.php
	page.php
	php/cache/05502c3005cfc79a8f140db5f99b8f93.png
	php/cache/0da8de06a223782c90962ab395c8a0ce.png
	php/cache/0dc6d304d273847e75c73b40f69784c5.png
	php/cache/14db4cadd37669ff8825f0cfc41de685.png
	php/cache/1bd44f8105c5fb43a1b3b817e0c9566b.png
	php/cache/27860cddd6d5572441bae5caf4f1b8dd.png
	php/cache/2cb24809fdd292d7059cb860c8975bc8.png
	php/cache/2f24933af5604aa1819a15feebc3396a.png
	php/cache/3315ce1d0382c27921e2a560d8df3297.png
	php/cache/34d17713942a1cccf6a9ef5276cb0ef6.png
	php/cache/34d43fcc7295060be453819140c60664.png
	php/cache/3b745a9df63053a811cf05aa68f7a049.png
	php/cache/4ebcde795a0a32f006b6f81f60ad424a.png
	php/cache/6e2b063377bf8a4ab195bdcc0857a6e2.png
	php/cache/7f622857180e31488b0a452738c3b757.png
	php/cache/80f62078a8afea2cca3c27e054bd7938.png
	php/cache/8a6b671335fb96a484e21da103d4908b.png
	php/cache/9b212534428afea9ac828a05b4e41aac.png
	php/cache/9b74736ad4ff52463756c9c835938324.png
	php/cache/Thumbs.db
	php/cache/a5e2351f841c64d58644dc68e81f68a8.png
	php/cache/a7f0e9dbc15a32d18ec8283c8bf2c1ae.png
	php/cache/aada87892cf89f1ecbbe2a90cb4ace81.png
	php/cache/b063f0bb3f43e68c64be78f6564daf61.png
	php/cache/c16e716069b60311081042e337c3441e.png
	php/cache/e5de935b05bd43969b4fd7d923dd85f1.png
	php/cache/f3a5a6132166d8337d5786ac419f5707.png
	php/cache/f4ef7d662cf44fe755c42efe61186dee.png
	php/cache/index.html
	php/temp/ea926ab3bf6cccd7d8c47a66e713eed2.php
	php/wp-pagenavi.php
	portfolio-page.php
	querySort.php
	rtl.css
	screenshot.png
	search.php
	sidebar-footer.php
	sidebar.php
	single.php
	style.css
	tag.php
	taxonomy-portfolio_cat.php
	widgets/contact-form.php
	widgets/latest-portfolio.php
	widgets/latest-posts.php
	widgets/tabbed-widget.php
	work.php