capistrano
Merge https://github.com/GoranP/jagode

Conflicts:
	config/deploy.rb