Job

Job again
Fixing things Merge remote-tracking branch 'origin/master'

Conflicts:
	GUI_01/bin/.gitignore
Merge branch 'master' of https://github.com/wallister/Software-Engineering