Added Items
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Control/GlobalClassSelector.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Control/GlobalClassSelector.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Control/GlobalClassSelector.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Control/GlobalClassSelector.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Added Items
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Control/GlobalClassSelector.java
Fully implemented items
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Control/GlobalClassSelector.java