Merge pull request #1 from gnramos/master

Changed Makefile to ClientMakefile, created new Makefile to run full sim...