Revert "buhu"

This reverts commit f08793b76d4508867032bd5f99cbfc7ae87012bf.
Revert "Revert "buhu""

This reverts commit b31a5bf41a8d76783cc41b49abf74456bce60b13.
försökt lägga til ljud, commitar inte upp något nytt
Merge branch 'master' of https://github.com/nhkim91/TDDC76-Projekt-SI

Conflicts:
	src/main.cpp
	src/space_invader.cpp
Revert 83de395..f6e3b3f

This rolls back to commit 83de395422d3727f2bbe425f73731ca8475fee84.