Merge branch 'master' of https://github.com/independence2013/msj2013

Conflicts:
	GUI/src/GUI/GUI.java