Fix href
updated gitignore
changed id for testing
merge from master