initial commit
merge with github repo
fixed gitignore