A Few Small Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	GUI_01/src/migLayout/MyGUI.java
Merge branch 'master' of https://github.com/wallister/Software-Engineering