Added deployment script
Merge branch 'master' of github.com:noplanb/tbm-server

Conflicts:
	Gemfile.lock