inital creation
Merged conflicts on gitignore