Changed operators << and >> to handle both file and network
Solved issues
merge-commit seems to be working