initial commit
fix conflicts
readme + gitignore