Proper file, working with minor bug that all dates and times assumed as UTC
deleting backup file
Merge branch 'master' of https://github.com/taufika/Progin

Conflicts:
	parser.py~