Ändring på nya branschen
Merge branch 'master' of https://github.com/granatkotte/FED5-memory

Conflicts:
	html/test.html
Mr BAjs