Initial commit
Fixed merge conflicts
added files