removed framwork and it is hooked up
Merge branch 'master' of https://github.com/cts12/jersey-bus-tourism
icons and images added
Merge branch 'master' of https://github.com/cts12/jersey-bus-tourism
changed structure
move
Merge pull request #6 from cts12/feature/simon

Feature/simon
Updated live bus markers
Tidy Up + Bug Fixes