Merge pull request #23 from rphuber/dateFunctionJavascript

Date function javascript
moved the main.js back to the js folder
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR into dateFunctionJavascript