new file:   .gitignore
	new file:   _config.yml
	new file:   _includes/footer.html
	new file:   _includes/head.html
	new file:   _includes/header.html
	new file:   _layouts/default.html
	new file:   _layouts/page.html
	new file:   _layouts/post.html
	new file:   _posts/2014-09-11-welcome-to-jekyll.markdown
	new file:   _sass/_base.scss
	new file:   _sass/_layout.scss
	new file:   _sass/_syntax-highlighting.scss
	new file:   about.md
	new file:   css/main.scss
	new file:   feed.xml
	new file:   index.html
Merge branch 'master' of https://github.com/Qualphey/qualphey.github.io

Conflicts:
	_config.yml
	_includes/head.html
	_sass/_base.scss
	css/main.scss
	index.html

	new file:   .sass-cache/d492ad3a7c1c082666ff8e6ee3afde7bae27c448/_base.scssc
	new file:   .sass-cache/d492ad3a7c1c082666ff8e6ee3afde7bae27c448/_layout.scssc
	new file:   .sass-cache/d492ad3a7c1c082666ff8e6ee3afde7bae27c448/_syntax-highlighting.scssc
	new file:   LICENSE
	new file:   README.md
	modified:   _config.yml
	modified:   _includes/head.html
	new file:   _posts/2014-09-11-introduction.markdown
	modified:   _sass/_base.scss
	modified:   css/main.scss
	new file:   qualphey.github.io
	new file:   trip.html