Re-did connection GUI layout
Added Stream JSON
Updates
Merge pull request #24 from NomNuggetNom/nom

Update master