Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is behind 'origin/master' by 5 commits, and can be fast-forwarded.
   (use "git pull" to update your local branch)

 Changes to be committed:
	new file:   _posts/Print/1.txt
	new file:   _posts/Print/kublahan.txt
	modified:   _posts/citata/2013-07-19-Words.markdown
	new file:   _posts/first_aid
Merge branch 'master' of https://github.com/Toboe/thule

Conflicts:
	_posts/citata/2013-07-19-Words.markdown