Restructure fishing interface
Merge branch 'master' of https://github.com/SJakobsen/DIM3-Team-M

Conflicts:
	go_fish_project/static/css/shop.css