Initial commit
Pulling and fixing merge conflicts