Update 3.1
Merge branch 'master' of https://github.com/PernilleJH/APJ

Conflicts:
	SideScroller/Assets/Main.unity
	SideScroller/Assets/Scripts/FisherMan.cs