ok.
Merge branch 'gh-pages' of github.com:bingdow/cv into gh-pages

Conflicts:
	Parallax-JS-master/css/chrome.css
	Parallax-JS-master/css/reset.css
	Parallax-JS-master/images/grey-dot.png
	Parallax-JS-master/images/grey-pink-dot.png
	Parallax-JS-master/images/menu-arrow.png
	Parallax-JS-master/images/menu-bg.png
	Parallax-JS-master/js/backgrounds.js
	Parallax-JS-master/js/html5.js
	Parallax-JS-master/js/jquery-1.7.1.js
	Parallax-JS-master/js/jquery-1.7.min.js
	Parallax-JS-master/js/kinetics.js
	Parallax-JS-master/js/parallax.js
	Parallax-JS-master/js/side-nav.js
	Parallax-JS-master/readme.md
	images/grey-dot.png
	images/grey-pink-dot.png
	images/len_top.jpg
	images/menu-arrow.png
	images/menu-bg.png
	index.html
	js/backgrounds.js
	js/html5.js
	js/jquery-1.7.1.js
	js/jquery-1.7.min.js
	js/kinetics.js
	js/parallax.js
	js/side-nav.js
	style.css
	yaml/add-ons/accessible-tabs/jquery.tabs.js
	yaml/add-ons/accessible-tabs/tabs.css
	yaml/add-ons/microformats/icons/external_link.png
	yaml/add-ons/microformats/icons/hcalendar.png
	yaml/add-ons/microformats/icons/hcard.png
	yaml/add-ons/microformats/icons/icon-geo.png
	yaml/add-ons/microformats/icons/icon-hatom.png
	yaml/add-ons/microformats/icons/icon-haudio.png
	yaml/add-ons/microformats/icons/icon-hcalendar-add.png
	yaml/add-ons/microformats/icons/icon-hcalendar-download.png
	yaml/add-ons/microformats/icons/icon-hcalendar.png
	yaml/add-ons/microformats/icons/icon-hcard-add.png
	yaml/add-ons/microformats/icons/icon-hcard-download.png
	yaml/add-ons/microformats/icons/icon-hcard.png
	yaml/add-ons/microformats/icons/icon-hresume.png
	yaml/add-ons/microformats/icons/icon-rel-tag.png
	yaml/add-ons/microformats/icons/icon-xfn.png
	yaml/add-ons/microformats/icons/xfn/xfn-child.png
	yaml/add-ons/microformats/icons/xfn/xfn-colleague-met.png
	yaml/add-ons/microformats/icons/xfn/xfn-colleague.png
	yaml/add-ons/microformats/icons/xfn/xfn-friend-met.png
	yaml/add-ons/microformats/icons/xfn/xfn-friend.png
	yaml/add-ons/microformats/icons/xfn/xfn-me.png
	yaml/add-ons/microformats/icons/xfn/xfn-parent.png
	yaml/add-ons/microformats/icons/xfn/xfn-small.png
	yaml/add-ons/microformats/icons/xfn/xfn-spouse.png
	yaml/add-ons/microformats/icons/xfn/xfn-sweetheart-met.png
	yaml/add-ons/microformats/icons/xfn/xfn-sweetheart.png
	yaml/add-ons/microformats/microformats.css
	yaml/add-ons/rtl-support/core/base-rtl.css
	yaml/add-ons/rtl-support/core/base-rtl.min.css
	yaml/add-ons/rtl-support/forms/gray-theme-rtl.css
	yaml/add-ons/rtl-support/navigation/hlist-rtl.css
	yaml/add-ons/rtl-support/navigation/vlist-rtl.css
	yaml/add-ons/rtl-support/screen/typography-rtl.css
	yaml/add-ons/syncheight/jquery.syncheight.js
	yaml/core/base.css
	yaml/core/base.min.css
	yaml/core/iehacks.css
	yaml/core/iehacks.min.css
	yaml/core/js/yaml-focusfix.js
	yaml/forms/gray-theme.css
	yaml/navigation/hlist.css
	yaml/navigation/vlist.css
	yaml/print/print.css
	yaml/screen/grid-960gs-12.css
	yaml/screen/grid-960gs-16.css
	yaml/screen/grid-blueprint.css
	yaml/screen/grid-fluid-12col.css
	yaml/screen/screen-FULLPAGE-layout.css
	yaml/screen/screen-PAGE-layout.css
	yaml/screen/typography.css