You misspelled sentence
I did stuff
Merge branch 'master' of github.com:adamclaassen/arduino-gps-parser

Conflicts:
	parser.c