Integrated program options
added config file parser
Added a few comments to clarify client_main
Uncomment servers.
Integrated program options
added config file parser
Added Makefile
Merge with labelle
Merge remote-tracking branch 'labelle/master' into progopt

Conflicts:
	mp1/Makefile
	mp1/client_main.cpp