Merge branch 'master' of https://github.com/Mauraders/web
Merge branch 'master' of https://github.com/Mauraders/web
changed blue glow to white-green glow in the home_page.css
fixing css for timeline
Merge branch 'master' of https://github.com/Mauraders/web
Merge branch 'master' of https://github.com/Mauraders/web into greenglow
added timeline css and html to website/template/index and website/static/css
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
fixed the font-awesome issue in templates/index.html
fixed the navbar font and timeline font conflict in templates/index.html and style.css
Merge pull request #14 from Mauraders/greenglow

Greenglow