created faux master to use for collab development
Merge branch 'ecgprc_sprint1' of https://github.com/Codes-With-Eagles-SWE2014/Client into ecgprc_sprint1