Initial commit
merging upstream changes to gitignore and README