commit before pull
merged from github
got working with my current javascript