WIP
less of a wip
even less of a wip
Crunch time
Merge branch 'front-end-push' of https://github.com/shadibarhoumi/FeedYourNetwork

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