Merge pull request #2 from Bekjarce/master

Merge pull request #3 from NickJord/master
Merge pull request #4 from NickJord/master

Merge pull request #2 from Bekjarce/master
Merge pull request #5 from stefanMane/master

blabla
Merge pull request #2 from Bekjarce/master

Smeniv nesto