initial
merge gitignore
ready for github push