tidying up
Merge branch 'master' of github.com:team461WBI/scoutify-hub

Conflicts:
	src/main.c