try
Merge branch 'master' of https://github.com/SilentComics/silentcomics.github.io

Conflicts:
	Rakefile.rb