Added timeout to prevent the program from waiting forever
Merge branch 'master' of https://github.com/jcbozonier/DivvyData

Conflicts:
	convert_minutes_to_csv.py