er'

Conflicts:
	gpsClass.cpp
	gpsClass.h
Merge branch 'RMCParser'

merged RMCParser