passing year strings
dfd
Merge branch 'master' of https://github.com/sukwanlee/thoughtdots

Conflicts:
	templates/data_detail.html