Commiting for pull
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Model/MainHub.java
Added some AI stuff
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
for pull
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Fixing AI
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Model/AIModel.java
more AI stuff
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Model/MainHub.java
AIchanges
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

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

Conflicts:
	src/Model/MainHub.java
	src/Model/Skills/Wizard/SkillAbsorb.java
	src/View/ShoppingView.java