Actually started work on add first
Actually started work

Conflicts:
	main.cpp