Server Update
Server Update
Merge branch 'ServerUpdate' into armbranch
Merge pull request #2 from mtevosyan/armbranch

Armbranch
Stub Data Server
Merge pull request #4 from mtevosyan/stubdata

Stub Data Server
Merge pull request #3 from mtevosyan/stubdata

Stub Data Server
Merge pull request #5 from mtevosyan/layout

Layout
Merge pull request #6 from mtevosyan/armbranch

Armbranch
Layout/css changes
Merge branch 'master' of https://github.com/mtevosyan/BusVisualization into layout