deleted extra end in aggregator.rb
merge conflicts fixed
pulling info-box into single-info-window feature branch
Merge branch 'info-box' of https://github.com/ztnark/chicageaux into single-info-window
pulling new master
Merge branch 'master' of https://github.com/ztnark/chicageaux into single-info-window
merge conflicts fixed
added stationName to divvy infoWindows
removed eta from trains
added feature mouseover and mouseout for bikes and trains
mouseover-mouseout events working for all markers
event click feature added
more info box
fixed merge conflicts after pulling deployed master
instagram marker click link working
recommitting isues with heroku deployed version
fixed merge conflicts
Merge pull request #40 from ztnark/single-info-window

Single info window