initial commit
merge in github stuff
add gitignore