Resolving issues of connection and conflicts
Resolving issues of connection and conflicts
Merge pull request #333 from Holywa/fixingThings

Fixing things