readding images
readding images
readding images
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/View/MainView.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Redid the ownedskills
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Reading stuff