AlmostThere
Merge remote-tracking branch 'origin/master'

Conflicts:
	ConsoleApplication3/ConsoleApplication3.sdf
	ConsoleApplication3/ConsoleApplication3.v12.suo
	ConsoleApplication3/ConsoleApplication3/AdultBev.cpp
	ConsoleApplication3/ConsoleApplication3/AdultBev.h
	ConsoleApplication3/ConsoleApplication3/Debug/AdultBev.obj

	ConsoleApplication3/ConsoleApplication3/Debug/ConsoleA.80996413.tlog/CL.read.1.tlog

	ConsoleApplication3/ConsoleApplication3/Debug/ConsoleA.80996413.tlog/CL.write.1.tlog

	ConsoleApplication3/ConsoleApplication3/Debug/ConsoleA.80996413.tlog/cl.command.1.tlog
	ConsoleApplication3/ConsoleApplication3/Debug/ConsoleApplication3.log
	ConsoleApplication3/ConsoleApplication3/Debug/Drinks.obj
	ConsoleApplication3/ConsoleApplication3/Debug/Ingredients.obj
	ConsoleApplication3/ConsoleApplication3/Debug/MiscFunk.obj
	ConsoleApplication3/ConsoleApplication3/Debug/Source.obj
	ConsoleApplication3/ConsoleApplication3/Debug/vc120.idb
	ConsoleApplication3/ConsoleApplication3/Debug/vc120.pdb
	ConsoleApplication3/ConsoleApplication3/Drinks.h
	ConsoleApplication3/ConsoleApplication3/MiscFunk.cpp
	ConsoleApplication3/ConsoleApplication3/Source.cpp
	ConsoleApplication3/Debug/ConsoleApplication3.pdb