new file:   css/freenbar.css
	new file:   css/freenbar.min.css
	modified:   css/style.css
	deleted:    downloads/demo.html
	new file:   downloads/index.html
	new file:   downloads/index.html.bak
	modified:   index.html
	new file:   index.html.bak
	new file:   js/freenbar.min.js
	renamed:    news/color/default.css -> news-old/color/default.css
	renamed:    news/css/animate.css -> news-old/css/animate.css
	renamed:    news/css/bootstrap.min.css -> news-old/css/bootstrap.min.css
	renamed:    news/css/dlmenu.css -> news-old/css/dlmenu.css
	renamed:    news/css/example_ticker.css -> news-old/css/example_ticker.css
	renamed:    news/css/example_zframework.css -> news-old/css/example_zframework.css
	renamed:    news/css/font-awesome.min.css -> news-old/css/font-awesome.min.css
	renamed:    news/css/overwrite.css -> news-old/css/overwrite.css
	renamed:    news/css/simpletextrotator.css -> news-old/css/simpletextrotator.css
	renamed:    news/css/style.css -> news-old/css/style.css
	renamed:    news/fonts/FontAwesome.otf -> news-old/fonts/FontAwesome.otf
	renamed:    news/fonts/fontawesome-webfont.eot -> news-old/fonts/fontawesome-webfont.eot
	renamed:    news/fonts/fontawesome-webfont.svg -> news-old/fonts/fontawesome-webfont.svg
	renamed:    news/fonts/fontawesome-webfont.ttf -> news-old/fonts/fontawesome-webfont.ttf
	renamed:    news/fonts/fontawesome-webfont.woff -> news-old/fonts/fontawesome-webfont.woff
	renamed:    news/fonts/icomoon/icomoon.dev.svg -> news-old/fonts/icomoon/icomoon.dev.svg
	renamed:    news/fonts/icomoon/icomoon.eot -> news-old/fonts/icomoon/icomoon.eot
	renamed:    news/fonts/icomoon/icomoon.svg -> news-old/fonts/icomoon/icomoon.svg
	renamed:    news/fonts/icomoon/icomoon.ttf -> news-old/fonts/icomoon/icomoon.ttf
	renamed:    news/fonts/icomoon/icomoon.woff -> news-old/fonts/icomoon/icomoon.woff
	renamed:    news/fonts/icomoon/license.txt -> news-old/fonts/icomoon/license.txt
	renamed:    news/img/black-angle.png -> news-old/img/black-angle.png
	renamed:    news/img/spacer/1.jpg -> news-old/img/spacer/1.jpg
	renamed:    news/img/spacer/2.jpg -> news-old/img/spacer/2.jpg
	renamed:    news/index.html -> news-old/index.html
	renamed:    news/js/Old_English_Text_MT_400.font.js -> news-old/js/Old_English_Text_MT_400.font.js
	renamed:    news/js/bootstrap.min.js -> news-old/js/bootstrap.min.js
	renamed:    news/js/cufon-yui.js -> news-old/js/cufon-yui.js
	new file:   news-old/js/custom.js
	renamed:    news/js/jquery-1.11.1.min.js -> news-old/js/jquery-1.11.1.min.js
	renamed:    news/js/jquery.dlmenu.js -> news-old/js/jquery.dlmenu.js
	renamed:    news/js/jquery.js -> news-old/js/jquery.js
	renamed:    news/js/jquery.smooth-scroll.min.js -> news-old/js/jquery.smooth-scroll.min.js
	renamed:    news/js/jquery.vticker.js -> news-old/js/jquery.vticker.js
	new file:   news-old/js/jquery.zrssfeed.js
	new file:   news-old/js/jquery.zrssfeed.min.js
	renamed:    news/js/modernizr.custom.js -> news-old/js/modernizr.custom.js
	new file:   news-old/js/wow.min.js
	modified:   news/index.html
	new file:   news/index.html.bak
	modified:   sub-files/css/style.css
	renamed:    sub-files/css/grid/8cols.css -> tools/css/8cols.css
	modified:   tools/index.html
	new file:   tools/index.html.bak
Merge branch 'gh-pages' of https://github.com/jrc2/fortune-website into gh-pages

Conflicts:
	downloads/demo.html

	new file:   downloads/demo.html
Merge branch 'gh-pages' of https://github.com/jrc2/fortune-website into gh-pages