Merge pull request #6 from hrefnanana/master

commita til eyrunar