Scouting software merged

Merged client & server, w/ executable jars