added shuttle_connection
Merge branch 'master' of https://github.com/Franck-Dernoncourt/MIT-15.058

Conflicts:
	src/main.py

add shuttle connection