Automated commit at 2014-04-28 07:18:47 UTC by middleman-deploy 0.2.3
Merge branch 'master' of github.com:rythgs/rythgs.github.io

Conflicts:
	feed.xml
	index.html