startup script
Merge branch 'master' of https://github.com/siejkowski/citybiker-server

Conflicts:
	start.sh
Merge branch 'master' of https://github.com/siejkowski/citybiker-server