New network functions
Merge branch 'master' of https://github.com/benmcmorran/cs3516-prog3

Conflicts:
	app.c