first commit
minor bug fixes for returning tokens
merge fixes for readme and gitignore