Initial commit
gitignore conflcits
readme fix