Merge branch 'test' of github.com:Grulfen/solar into test

Conflicts:
	src/test.cpp
Merge branch 'test' of github.com:Grulfen/solar into test
Merge branch 'test' of github.com:Grulfen/solar into test
Haha!
Merge branch 'test' of github.com:Grulfen/solar into test
Fixat med tangentbordet, inte finaste lösningen, men funkar
Merge branch 'master' into test

Conflicts:
	src/test.cpp
Merge branch 'test' of github.com:Grulfen/solar into test
Merge branch 'test'