added line break, need to update this whole client for bash script styles
Merge branch 'master' into feature/dsp_386

Manually resolved/edited <./src/client/main.cpp>