unfinished time div
adding changes to index styling
again minot
minor2
3
Merge branch 'master' of https://github.com/rjbernaldo/live-analytics into index_page_styling

Conflicts:

fixed merge issues
Added the forever module to keep node server up
Merge pull request #34 from rjbernaldo/index_page_styling

Index page styling
Merge branch 'master' into forever-uptime-module
Merge pull request #35 from rjbernaldo/forever-uptime-module

Added the forever module to keep node server up
Uncommented newrelic require
Merge pull request #36 from rjbernaldo/forever-uptime-module

Uncommented newrelic require
Modified startup scripts to work anywhere
Merge pull request #37 from rjbernaldo/scripts

Modified startup scripts to work anywhere
Fixed topFiveHashtagCounts query in database model.
Merge branch 'master' into database_model