try jekyll-bootstrat
Merge pull request #1 from JoshuaGhost/jekyllbootstrap

try jekyll-bootstrat
refresh
Merge branch 'jekyllbootstrap' of https://github.com/JoshuaGhost/JoshuaGhost.github.io into jekyllbootstrap

Conflicts:
	about/index.html
	archive.html
	assets/themes/twitter/bootstrap/css/bootstrap.2.2.2.min.css
	assets/themes/twitter/css/style.css
	atom.xml
	categories.html
	feed.xml
	index.html
	pages.html
	sitemap.txt
	tags.html