git buggade fick ta bort kommits
as
asd
aa
a
Merge branch 'master' of https://github.com/Grenmyr/Scrum

Conflicts:
	scrumproject.xls