Merge branch 'master' of https://github.com/colsen1991/programvareutvikling_gr06_2013.git