wut
merge
Merge branch 'master' of github.com:jantorestolsvik/AiProg_project3
Merge branch 'master' of github.com:jantorestolsvik/AiProg_project3
cleaned up a bit