deleted:    2014/11/25/hello-world/index.html
deleted:    CNAME
	deleted:    README
	deleted:    archives/2014/11/index.html
	deleted:    archives/2014/index.html
	deleted:    archives/index.html
	deleted:    css/fonts/FontAwesome.otf
	deleted:    css/fonts/fontawesome-webfont.eot
	deleted:    css/fonts/fontawesome-webfont.svg
	deleted:    css/fonts/fontawesome-webfont.ttf
	deleted:    css/fonts/fontawesome-webfont.woff
	deleted:    css/images/banner.jpg
	deleted:    css/style.css
	deleted:    fancybox/blank.gif
	deleted:    fancybox/fancybox_loading.gif
	deleted:    fancybox/fancybox_loading@2x.gif
	deleted:    fancybox/fancybox_overlay.png
	deleted:    fancybox/fancybox_sprite.png
	deleted:    fancybox/fancybox_sprite@2x.png
	deleted:    fancybox/helpers/fancybox_buttons.png
	deleted:    fancybox/helpers/jquery.fancybox-buttons.css
	deleted:    fancybox/helpers/jquery.fancybox-buttons.js
	deleted:    fancybox/helpers/jquery.fancybox-media.js
	deleted:    fancybox/helpers/jquery.fancybox-thumbs.css
	deleted:    fancybox/helpers/jquery.fancybox-thumbs.js
	deleted:    fancybox/jquery.fancybox.css
	deleted:    fancybox/jquery.fancybox.js
	deleted:    fancybox/jquery.fancybox.pack.js
	deleted:    index.html
Merge branch 'master' of http://github.com/puras/puras.github.io

Conflicts:
	2014/11/25/hello-world/index.html
	archives/2014/11/index.html
	archives/2014/index.html
	archives/index.html
	index.html