dummy
Merge branch 'master' of https://github.com/anerud/AIGroup1

Conflicts:
	shrdlite.js