Initial commit of homepage
Merged with trunk of Wordpress (Merge remote branch 'origin/master')

Conflicts:
	index.php
	wp-activate.php
	wp-admin/about.php
	wp-admin/admin-ajax.php
	wp-admin/admin-footer.php
	wp-admin/admin-functions.php
	wp-admin/admin-header.php
	wp-admin/admin-post.php
	wp-admin/admin.php
	wp-admin/async-upload.php
	wp-admin/comment.php
	wp-admin/credits.php
	wp-admin/css/color-picker-rtl.css
	wp-admin/css/color-picker-rtl.min.css
	wp-admin/css/color-picker.css
	wp-admin/css/color-picker.min.css
	wp-admin/css/colors-classic.css
	wp-admin/css/colors-classic.min.css
	wp-admin/css/colors-fresh.css
	wp-admin/css/colors-fresh.min.css
	wp-admin/css/customize-controls-rtl.css
	wp-admin/css/customize-controls-rtl.min.css
	wp-admin/css/customize-controls.css
	wp-admin/css/customize-controls.min.css
	wp-admin/css/farbtastic.css
	wp-admin/css/ie-rtl.css
	wp-admin/css/ie-rtl.min.css
	wp-admin/css/ie.css
	wp-admin/css/ie.min.css
	wp-admin/css/install.css
	wp-admin/css/install.min.css
	wp-admin/css/media-rtl.css
	wp-admin/css/media-rtl.min.css
	wp-admin/css/media.css
	wp-admin/css/media.min.css
	wp-admin/css/wp-admin-rtl.css
	wp-admin/css/wp-admin-rtl.min.css
	wp-admin/custom-background.php
	wp-admin/custom-header.php
	wp-admin/customize.php
	wp-admin/edit-comments.php
	wp-admin/edit-form-advanced.php
	wp-admin/edit-form-comment.php
	wp-admin/edit-link-form.php
	wp-admin/edit-tag-form.php
	wp-admin/edit-tags.php
	wp-admin/edit.php
	wp-admin/export.php
	wp-admin/freedoms.php
	wp-admin/images/align-center-2x.png
	wp-admin/images/align-center.png
	wp-admin/images/align-left-2x.png
	wp-admin/images/align-left.png
	wp-admin/images/align-none-2x.png
	wp-admin/images/align-none.png
	wp-admin/images/align-right-2x.png
	wp-admin/images/align-right.png
	wp-admin/images/arrows-2x.png
	wp-admin/images/arrows-dark-2x.png
	wp-admin/images/arrows-dark-vs-2x.png
	wp-admin/images/arrows-dark-vs.png
	wp-admin/images/arrows-dark.png
	wp-admin/images/arrows-vs-2x.png
	wp-admin/images/arrows-vs.png
	wp-admin/images/arrows.png
	wp-admin/images/bubble_bg-2x.gif
	wp-admin/images/bubble_bg-rtl-2x.gif
	wp-admin/images/bubble_bg-rtl.gif
	wp-admin/images/bubble_bg.gif
	wp-admin/images/comment-grey-bubble-2x.png
	wp-admin/images/comment-grey-bubble.png
	wp-admin/images/date-button-2x.gif
	wp-admin/images/date-button.gif
	wp-admin/images/generic.png
	wp-admin/images/icons32-2x.png
	wp-admin/images/icons32-vs-2x.png
	wp-admin/images/icons32-vs.png
	wp-admin/images/icons32.png
	wp-admin/images/imgedit-icons-2x.png
	wp-admin/images/imgedit-icons.png
	wp-admin/images/list-2x.png
	wp-admin/images/list.png
	wp-admin/images/loading.gif
	wp-admin/images/marker.png
	wp-admin/images/mask.png
	wp-admin/images/media-button-2x.png
	wp-admin/images/media-button-image.gif
	wp-admin/images/media-button-music.gif
	wp-admin/images/media-button-other.gif
	wp-admin/images/media-button-video.gif
	wp-admin/images/media-button.png
	wp-admin/images/menu-2x.png
	wp-admin/images/menu-shadow-rtl.png
	wp-admin/images/menu-shadow.png
	wp-admin/images/menu-vs-2x.png
	wp-admin/images/menu-vs.png
	wp-admin/images/menu.png
	wp-admin/images/no.png
	wp-admin/images/press-this-2x.png
	wp-admin/images/press-this.png
	wp-admin/images/resize-2x.gif
	wp-admin/images/resize-rtl-2x.gif
	wp-admin/images/resize-rtl.gif
	wp-admin/images/resize.gif
	wp-admin/images/screenshots/about-color-picker.png
	wp-admin/images/screenshots/about-media.png
	wp-admin/images/screenshots/about-retina.png
	wp-admin/images/screenshots/about-twenty-twelve.png
	wp-admin/images/se.png
	wp-admin/images/sort-2x.gif
	wp-admin/images/sort.gif
	wp-admin/images/stars-2x.png
	wp-admin/images/stars-rtl-2x.png
	wp-admin/images/stars-rtl.png
	wp-admin/images/stars.png
	wp-admin/images/welcome-icons-2x.png
	wp-admin/images/welcome-icons.png
	wp-admin/images/wheel.png
	wp-admin/images/wordpress-logo-2x.png
	wp-admin/images/wordpress-logo.png
	wp-admin/images/wp-badge-2x.png
	wp-admin/images/wp-badge.png
	wp-admin/images/wp-logo-2x.png
	wp-admin/images/wp-logo-vs-2x.png
	wp-admin/images/wp-logo-vs.png
	wp-admin/images/wp-logo.png
	wp-admin/images/wpspin_light-2x.gif
	wp-admin/images/wpspin_light.gif
	wp-admin/images/xit-2x.gif
	wp-admin/images/xit.gif
	wp-admin/images/yes.png
	wp-admin/import.php
	wp-admin/includes/admin.php
	wp-admin/includes/ajax-actions.php
	wp-admin/includes/bookmark.php
	wp-admin/includes/class-ftp-pure.php
	wp-admin/includes/class-ftp-sockets.php
	wp-admin/includes/class-ftp.php
	wp-admin/includes/class-pclzip.php
	wp-admin/includes/class-wp-comments-list-table.php
	wp-admin/includes/class-wp-filesystem-ftpext.php
	wp-admin/includes/class-wp-filesystem-ssh2.php
	wp-admin/includes/class-wp-importer.php
	wp-admin/includes/class-wp-links-list-table.php
	wp-admin/includes/class-wp-media-list-table.php
	wp-admin/includes/class-wp-ms-sites-list-table.php
	wp-admin/includes/class-wp-ms-themes-list-table.php
	wp-admin/includes/class-wp-ms-users-list-table.php
	wp-admin/includes/class-wp-plugins-list-table.php
	wp-admin/includes/class-wp-posts-list-table.php
	wp-admin/includes/class-wp-terms-list-table.php
	wp-admin/includes/class-wp-themes-list-table.php
	wp-admin/includes/comment.php
	wp-admin/includes/continents-cities.php
	wp-admin/includes/dashboard.php
	wp-admin/includes/deprecated.php
	wp-admin/includes/export.php
	wp-admin/includes/image-edit.php
	wp-admin/includes/image.php
	wp-admin/includes/import.php
	wp-admin/includes/list-table.php
	wp-admin/includes/media.php
	wp-admin/includes/menu.php
	wp-admin/includes/meta-boxes.php
	wp-admin/includes/misc.php
	wp-admin/includes/ms-deprecated.php
	wp-admin/includes/ms.php
	wp-admin/includes/nav-menu.php
	wp-admin/includes/plugin-install.php
	wp-admin/includes/post.php
	wp-admin/includes/schema.php
	wp-admin/includes/screen.php
	wp-admin/includes/taxonomy.php
	wp-admin/includes/template.php
	wp-admin/includes/theme.php
	wp-admin/includes/update.php
	wp-admin/includes/upgrade.php
	wp-admin/includes/user.php
	wp-admin/includes/widgets.php
	wp-admin/index.php
	wp-admin/install-helper.php
	wp-admin/install.php
	wp-admin/js/cat.js
	wp-admin/js/cat.min.js
	wp-admin/js/categories.js
	wp-admin/js/categories.min.js
	wp-admin/js/color-picker.js
	wp-admin/js/color-picker.min.js
	wp-admin/js/comment.js
	wp-admin/js/comment.min.js
	wp-admin/js/common.js
	wp-admin/js/common.min.js
	wp-admin/js/custom-background.js
	wp-admin/js/custom-background.min.js
	wp-admin/js/custom-fields.js
	wp-admin/js/custom-fields.min.js
	wp-admin/js/custom-header.js
	wp-admin/js/customize-controls.js
	wp-admin/js/customize-controls.min.js
	wp-admin/js/dashboard.js
	wp-admin/js/dashboard.min.js
	wp-admin/js/edit-comments.js
	wp-admin/js/edit-comments.min.js
	wp-admin/js/editor.js
	wp-admin/js/editor.min.js
	wp-admin/js/farbtastic.js
	wp-admin/js/gallery.js
	wp-admin/js/gallery.min.js
	wp-admin/js/image-edit.js
	wp-admin/js/image-edit.min.js
	wp-admin/js/inline-edit-post.js
	wp-admin/js/inline-edit-post.min.js
	wp-admin/js/inline-edit-tax.js
	wp-admin/js/inline-edit-tax.min.js
	wp-admin/js/iris.min.js
	wp-admin/js/link.js
	wp-admin/js/link.min.js
	wp-admin/js/media-gallery.js
	wp-admin/js/media-gallery.min.js
	wp-admin/js/media-upload.js
	wp-admin/js/media-upload.min.js
	wp-admin/js/media.js
	wp-admin/js/media.min.js
	wp-admin/js/nav-menu.js
	wp-admin/js/nav-menu.min.js
	wp-admin/js/password-strength-meter.js
	wp-admin/js/password-strength-meter.min.js
	wp-admin/js/plugin-install.js
	wp-admin/js/plugin-install.min.js
	wp-admin/js/post.js
	wp-admin/js/post.min.js
	wp-admin/js/postbox.js
	wp-admin/js/postbox.min.js
	wp-admin/js/revisions-js.php
	wp-admin/js/set-post-thumbnail.js
	wp-admin/js/set-post-thumbnail.min.js
	wp-admin/js/tags.js
	wp-admin/js/tags.min.js
	wp-admin/js/theme-preview.js
	wp-admin/js/theme-preview.min.js
	wp-admin/js/theme.js
	wp-admin/js/theme.min.js
	wp-admin/js/user-profile.js
	wp-admin/js/user-profile.min.js
	wp-admin/js/user-suggest.js
	wp-admin/js/user-suggest.min.js
	wp-admin/js/widgets.js
	wp-admin/js/widgets.min.js
	wp-admin/js/word-count.js
	wp-admin/js/word-count.min.js
	wp-admin/js/wp-fullscreen.js
	wp-admin/js/wp-fullscreen.min.js
	wp-admin/js/xfn.js
	wp-admin/js/xfn.min.js
	wp-admin/link-add.php
	wp-admin/link-manager.php
	wp-admin/link-parse-opml.php
	wp-admin/link.php
	wp-admin/load-scripts.php
	wp-admin/load-styles.php
	wp-admin/maint/repair.php
	wp-admin/media-new.php
	wp-admin/media-upload.php
	wp-admin/media.php
	wp-admin/menu-header.php
	wp-admin/menu.php
	wp-admin/moderation.php
	wp-admin/ms-admin.php
	wp-admin/ms-delete-site.php
	wp-admin/ms-edit.php
	wp-admin/ms-options.php
	wp-admin/ms-sites.php
	wp-admin/ms-themes.php
	wp-admin/ms-upgrade-network.php
	wp-admin/ms-users.php
	wp-admin/my-sites.php
	wp-admin/nav-menus.php
	wp-admin/network/about.php
	wp-admin/network/admin.php
	wp-admin/network/credits.php
	wp-admin/network/edit.php
	wp-admin/network/freedoms.php
	wp-admin/network/index.php
	wp-admin/network/menu.php
	wp-admin/network/plugin-editor.php
	wp-admin/network/plugin-install.php
	wp-admin/network/plugins.php
	wp-admin/network/profile.php
	wp-admin/network/settings.php
	wp-admin/network/setup.php
	wp-admin/network/site-info.php
	wp-admin/network/site-new.php
	wp-admin/network/site-settings.php
	wp-admin/network/site-themes.php
	wp-admin/network/site-users.php
	wp-admin/network/sites.php
	wp-admin/network/theme-editor.php
	wp-admin/network/theme-install.php
	wp-admin/network/themes.php
	wp-admin/network/update-core.php
	wp-admin/network/update.php
	wp-admin/network/upgrade.php
	wp-admin/network/user-edit.php
	wp-admin/network/user-new.php
	wp-admin/network/users.php
	wp-admin/options-discussion.php
	wp-admin/options-general.php
	wp-admin/options-head.php
	wp-admin/options-media.php
	wp-admin/options-permalink.php
	wp-admin/options-reading.php
	wp-admin/options-writing.php
	wp-admin/options.php
	wp-admin/plugin-editor.php
	wp-admin/plugin-install.php
	wp-admin/plugins.php
	wp-admin/post-new.php
	wp-admin/post.php
	wp-admin/press-this.php
	wp-admin/profile.php
	wp-admin/revision.php
	wp-admin/setup-config.php
	wp-admin/theme-editor.php
	wp-admin/theme-install.php
	wp-admin/themes.php
	wp-admin/tools.php
	wp-admin/update-core.php
	wp-admin/update.php
	wp-admin/upgrade-functions.php
	wp-admin/upgrade.php
	wp-admin/upload.php
	wp-admin/user-edit.php
	wp-admin/user-new.php
	wp-admin/user/about.php
	wp-admin/user/admin.php
	wp-admin/user/credits.php
	wp-admin/user/freedoms.php
	wp-admin/user/index.php
	wp-admin/user/menu.php
	wp-admin/user/profile.php
	wp-admin/user/user-edit.php
	wp-admin/users.php
	wp-admin/widgets.php
	wp-blog-header.php
	wp-comments-post.php
	wp-content/themes/twentyeleven/images/comment-bubble-dark-rtl.png
	wp-content/themes/twentyeleven/images/comment-bubble-dark.png
	wp-content/themes/twentyeleven/images/comment-bubble-rtl.png
	wp-content/themes/twentyeleven/images/comment-bubble.png
	wp-content/themes/twentyeleven/images/headers/chessboard.jpg
	wp-content/themes/twentyeleven/images/headers/hanoi.jpg
	wp-content/themes/twentyeleven/images/headers/lanterns-thumbnail.jpg
	wp-content/themes/twentyeleven/images/headers/lanterns.jpg
	wp-content/themes/twentyeleven/images/headers/pine-cone.jpg
	wp-content/themes/twentyeleven/images/headers/shore.jpg
	wp-content/themes/twentyeleven/images/headers/trolley.jpg
	wp-content/themes/twentyeleven/images/headers/wheel.jpg
	wp-content/themes/twentyeleven/images/headers/willow.jpg
	wp-content/themes/twentyeleven/images/search.png
	wp-content/themes/twentyeleven/inc/images/content-sidebar.png
	wp-content/themes/twentyeleven/inc/images/content.png
	wp-content/themes/twentyeleven/inc/images/dark.png
	wp-content/themes/twentyeleven/inc/images/light.png
	wp-content/themes/twentyeleven/inc/images/sidebar-content.png
	wp-content/themes/twentyeleven/screenshot.png
	wp-content/themes/twentyten/images/headers/berries-thumbnail.jpg
	wp-content/themes/twentyten/images/headers/berries.jpg
	wp-content/themes/twentyten/images/headers/cherryblossoms-thumbnail.jpg
	wp-content/themes/twentyten/images/headers/cherryblossoms.jpg
	wp-content/themes/twentyten/images/headers/concave-thumbnail.jpg
	wp-content/themes/twentyten/images/headers/concave.jpg
	wp-content/themes/twentyten/images/headers/fern-thumbnail.jpg
	wp-content/themes/twentyten/images/headers/fern.jpg
	wp-content/themes/twentyten/images/headers/forestfloor-thumbnail.jpg
	wp-content/themes/twentyten/images/headers/forestfloor.jpg
	wp-content/themes/twentyten/images/headers/inkwell-thumbnail.jpg
	wp-content/themes/twentyten/images/headers/inkwell.jpg
	wp-content/themes/twentyten/images/headers/path-thumbnail.jpg
	wp-content/themes/twentyten/images/headers/path.jpg
	wp-content/themes/twentyten/images/headers/sunset-thumbnail.jpg
	wp-content/themes/twentyten/images/headers/sunset.jpg
	wp-content/themes/twentyten/images/wordpress.png
	wp-content/themes/twentyten/screenshot.png
	wp-content/themes/twentytwelve/404.php
	wp-content/themes/twentytwelve/content-aside.php
	wp-content/themes/twentytwelve/content-link.php
	wp-content/themes/twentytwelve/content-none.php
	wp-content/themes/twentytwelve/content-page.php
	wp-content/themes/twentytwelve/content-quote.php
	wp-content/themes/twentytwelve/content.php
	wp-content/themes/twentytwelve/editor-style-rtl.css
	wp-content/themes/twentytwelve/footer.php
	wp-content/themes/twentytwelve/page.php
	wp-content/themes/twentytwelve/search.php
	wp-content/themes/twentytwelve/single.php
	wp-cron.php
	wp-includes/images/admin-bar-sprite-2x.png
	wp-includes/images/admin-bar-sprite.png
	wp-includes/images/arrow-pointer-blue.png
	wp-includes/images/crystal/archive.png
	wp-includes/images/crystal/audio.png
	wp-includes/images/crystal/code.png
	wp-includes/images/crystal/default.png
	wp-includes/images/crystal/document.png
	wp-includes/images/crystal/interactive.png
	wp-includes/images/crystal/spreadsheet.png
	wp-includes/images/crystal/text.png
	wp-includes/images/crystal/video.png
	wp-includes/images/rss.png
	wp-includes/images/toggle-arrow.png
	wp-includes/images/wlw/wp-comments.png
	wp-includes/images/wlw/wp-icon.png
	wp-includes/images/wlw/wp-watermark.png
	wp-includes/images/wpicons.png
	wp-includes/images/wpmini-blue.png
	wp-includes/js/crop/marqueeHoriz.gif
	wp-includes/js/crop/marqueeVert.gif
	wp-includes/js/imgareaselect/border-anim-h.gif
	wp-includes/js/imgareaselect/border-anim-v.gif
	wp-includes/js/jcrop/Jcrop.gif
	wp-includes/js/thickbox/loadingAnimation.gif
	wp-includes/js/thickbox/macFFBgHack.png
	wp-includes/js/thickbox/tb-close.png
	wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
	wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
	wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
	wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
	wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif
	wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
	wp-includes/js/tinymce/plugins/wordpress/img/image.gif
	wp-includes/js/tinymce/plugins/wordpress/img/video.gif
	wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png
	wp-includes/js/tinymce/plugins/wpeditimage/img/image.png
	wp-includes/js/tinymce/plugins/wpgallery/img/delete.png
	wp-includes/js/tinymce/plugins/wpgallery/img/edit.png
	wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png
	wp-includes/js/tinymce/themes/advanced/img/icons.gif
	wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/embedded.png
	wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/gallery.png
	wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif
	wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif
	wp-includes/js/tinymce/wp-tinymce.js.gz
	wp-links-opml.php
	wp-load.php
	wp-login.php
	wp-mail.php
	wp-settings.php
	wp-signup.php
	wp-trackback.php
	xmlrpc.php