initial
Merged conflicts on gitignore
heyhey