Changes style
Merge branch 'master' of https://github.com/shadibarhoumi/FeedYourNetwork into front-end-push

Conflicts:
	FeedYourNetwork.html
	client/network.js
WIP
less of a wip
even less of a wip
Crunch time
case and shadi, hacky
Merge branch 'front-end-push' of https://github.com/shadibarhoumi/FeedYourNetwork

Conflicts:
	client/eachContact.js
	server/main.js
more wip
case css stuffy
Merge branch 'front-end-push' of https://github.com/shadibarhoumi/FeedYourNetwork