resolving another conflict.
merging conflicts
more merge conflicts
redis to go
bundle install
precomp
fixed bug?
precomp1
editing
added proc
redis?
more and more
more and more
added stationName to divvy infoWindows
replace assets
replace assets1
more and more and more and more
deleted keys from developmentfile
more and more and more and more and more
more and more and more and more and more and more