Accepts -q flag, does not have user input yet
Resolved conflicts

Conflicts:
	main.cpp