added main
Merge origin/master
added new constructor to Connection.java
Added bind() method to Connection to try and bind a socket to an IP
conflict fixed
added NICResolver.java
Merge origin/master
Merge origin/GUI
added NICResolver.java
Merge branches 'camInterface' and 'master' of https://github.com/jimespen/ProSync into camInterface
Merge branches 'camInterface' and 'master' of https://github.com/jimespen/ProSync
added NICResolver.java
Merge branch 'master' of https://github.com/jimespen/ProSync
Updated modules for downloading mutliplefiles
Merge branch 'master' of https://github.com/jimespen/ProSync into camInterface
Updated modules for downloading mutliplefiles
Updated NISInterface and created feature for listitng out WIFI adapters