Merge branch 'master' of https://github.com/Webb-2/Kollosidan

Signed-off-by: Adam Hjerpe <adam.hjerpe@hotmail.com>
Merge branch 'master' of https://github.com/Webb-2/Kollosidan