Merge branch 'master' of https://github.com/Mauraders/web
Merge branch 'master' of https://github.com/Mauraders/web
Merge branch 'greenglow'
fixed main.js and JQuery module in index.html to make timeline dynamic