Conor Config
Merge of old files2
Refactor of Action phase and introduce Buy Phase
Merge conflict resolution