Testing sprint1 branch
Merge branch 'jrlmwc_sprint1' of https://github.com/Codes-With-Eagles-SWE2014/Client into ecgprc_sprint1