add gitignore
merge upstream and unversioned code!
merge upstream changes into github