Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into fixing_bugs
Merge pull request #91 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into fixing_bugs
Merge pull request #92 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design
fixing three failing tests
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into fixing_bugs

merging
Merge pull request #93 from fiery-skippers-2014/fixing_bugs

Fixing bugs
made 0 student teacher link consistent, removed the link
Merge pull request #94 from fiery-skippers-2014/fixing_bugs

made 0 student teacher link consistent, removed the link
fixed menu dropdown
fixed zoom button overlay issue
played with filter and hiding markers