javascript finished
Merge branch 'patrick'