Capistrano Test
Merge branch 'master' of github.com:ffalcade/depot

Conflicts:
	config/database.yml