Site updated at 2014-06-26 13:21:46 UTC
Site updated at 2014-06-26 13:37:40 UTC
Merge branch 'master' of https://github.com/alysisLeonis/alysisLeonis.github.io

Conflicts:
	about/index.html
	assets/bootstrap/docs/about.html
	assets/bootstrap/docs/components.html
	assets/bootstrap/docs/css.html
	assets/bootstrap/docs/customize.html
	assets/bootstrap/docs/getting-started.html
	assets/bootstrap/docs/javascript.html
	assets/bootstrap/docs/migration.html
	atom.xml
	blog/archives/index.html
	blog/categories/github/atom.xml
	blog/categories/github/index.html
	blog/categories/open-source/atom.xml
	blog/categories/open-source/index.html
	blog/index.html
	github-page/index.html
	hello-github/index.html
	index.html
	new-page/index.html
	sitemap.xml
	stylesheets/screen.css