added .gitignore
added hot fix makefile for multi-user build
Merge branch 'ecgprc_sprint1' of https://github.com/Codes-With-Eagles-SWE2014/Client into ecgprc_sprint1
Merge branch 'ecgprc_sprint1'

* ecgprc_sprint1:
  added hot fix makefile for multi-user build
  added .gitignore

Conflicts:
	.gitignore