sdf
Merge branch 'master' of https://github.com/andreabjork/Gamestore

Conflicts:
	Webstore/SQL/gamestore.db