style cleanup
 "merge"Merge branch 'master' of https://github.com/Twerkathon/front_end_client_server