deleted:    README.md
	deleted:    index.md
	modified:   about/index.html
	modified:   blog/index.html
	modified:   css/main.css
	modified:   feed.xml
	modified:   index.html
	modified:   jekyll/update/2014/11/16/2014-11-18-jekyll.html
	modified:   jekyll/update/2014/11/16/welcome-to-jekyll.html

	assets/
	new file:   assets/bootstrap/css/bootstrap-theme.css
	new file:   assets/bootstrap/css/bootstrap-theme.css.map
	new file:   assets/bootstrap/css/bootstrap-theme.min.css
	new file:   assets/bootstrap/css/bootstrap.css
	new file:   assets/bootstrap/css/bootstrap.css.map
	new file:   assets/bootstrap/css/bootstrap.min.css
	new file:   assets/bootstrap/fonts/glyphicons-halflings-regular.eot
	new file:   assets/bootstrap/fonts/glyphicons-halflings-regular.svg
	new file:   assets/bootstrap/fonts/glyphicons-halflings-regular.ttf
	new file:   assets/bootstrap/fonts/glyphicons-halflings-regular.woff
	new file:   assets/bootstrap/js/bootstrap.js
	new file:   assets/bootstrap/js/bootstrap.min.js
	new file:   assets/bootstrap/js/npm.js
	new file:   assets/jquery/jquery.js
	new file:   assets/jquery/jquery.min.js
	new file:   assets/jquery/jquery.min.map
Merge branch 'gh-pages' of https://github.com/trapias/trapias.github.io into gh-pages