second commit.
Merge branch 'master' of github.com:PaulMarclay/test_for_capistrano

Conflicts:
	.gitignore