updated scripts, css
Merge branch 'master' of https://github.com/whyu/wdi_project_2
updated
Merge branch 'development'
Merge branch 'master' of https://github.com/whyu/wdi_project_2
no parallax on the index :(