stuff
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MenuView.java
	magicprogramUI/war/derby.log