Did manual merge
Did some edits to input file
Merge branch 'test1' of https://github.com/joungskim/CGProject into test1

Conflicts:
	CGProject/CGProject/CSV Files Import/Dominion.csv