Initial Commit
Resolve merge conflicts from master