modified:   README.md
	new file:   assets/css/default.css
	modified:   assets/css/desktop.css
	modified:   assets/css/mobile.css
	new file:   assets/fonts/JosefinSans-Bold.ttf
	new file:   assets/fonts/JosefinSans-BoldItalic.ttf
	new file:   assets/fonts/JosefinSans-Italic.ttf
	new file:   assets/fonts/JosefinSans-Regular.ttf
	new file:   assets/icons/twitter.svg
	modified:   default.hbs
	modified:   index.hbs
	modified:   partials/socialLinks.hbs
	modified:   post.hbs
	new file:   preview.jpg
	modified:   preview.jpg
	deleted:    assets/icons/twitter.svg
Merge branch 'master' of https://github.com/camporez/Thinny

Conflicts:
	README.md

	modified:   README.md
	deleted:    assets/icons/twitter.svg
	deleted:    assets/icons/twitter.svg