created js folder
Merge branch 'chris'