Use proper grammar.
Merge branch 'lastname'

Conflicts:
	main.c
Move the ask name code into its own function and file