everything but the actual networking for picture and global sorts
removed a comment
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project