Some changes
Merge branch 'master' of github.com:AkarshES/Final-Sem-Project
Fixed merge conflict
Fixed merge conflict
Merge branch 'master' of github.com:AkarshES/Final-Sem-Project
Some changes
Merge branch 'master' of github.com:AkarshES/Final-Sem-Project
SOme changes
Minor UI changes
initial work on datetime filter
completed view code for datetime filter
Add pyGeoIP to extract compute country of requesting user.
Merge branch 'master' of github.com:AkarshES/Final-Sem-Project
Return JSON for date range
Change get_date_range to return unix time stamp
Merge branch 'master' of https://github.com/AkarshES/Final-Sem-Project into initial-log-by-time

Conflicts:
	angular/app/jinja-templates/layout.html
return dict for date_range
Merge branch 'master' of https://github.com/AkarshES/Final-Sem-Project into initial-log-by-time
added some missing requirements and ignore somemore sample data
initial implementation of log viewer with date range
Merge pull request #16 from ajy/initial-log-by-time

initial implementation of log viewer with date range