tset
changes
Merge branch 'master' of https://github.com/MitchBrinkman21/Q-BANK

Conflicts:
	Q-Bank/Form1.Designer.cs
Merge branch 'master' of https://github.com/MitchBrinkman21/Q-BANK