intermediate commit - network not done yet
Merge branch 'master' of https://github.com/uwacits4419/DSR
Update to network for full linux integration and a dummy linux integration linux_network
add DS_Store to git ignore
merge