Initial commit
Completing merge of local and remote repos