init
setup git
Merge branch 'master' of github.com:wurde/codebit_rails_capistrano

Conflicts:
	.gitignore