Merge branch 'unit_test' into CommandLine

Conflicts:
	CMakeLists.txt
Merge branch 'CommandLine' of https://github.com/johnmangan/cards into CommandLine

Conflicts:
	CMakeLists.txt
Merge branch 'CommandLine' of https://github.com/johnmangan/cards into CommandLine
Programming in group meeting, got CommandLine running, and being tested
Velu - made some changes to to CommandLine prototype