first commit
Fixed files for merging