first one
Merge branch 'master' of https://github.com/Elaineyang/FRDAnalyzer

Conflicts:
	FRDlogAnalyzer.py