daniel said commit
created flickdatasource
Merge branch 'master' of https://github.com/jogloran/govhack

Conflicts:
	app.py
got images working with timeline