Init commit
Removed unneccessary files
Merge conflict