Commit to pull
Merge branch 'master' of https://github.com/Nexcius/ggj-hamar

Conflicts:
	Assets/Scripts/BusMovement.cs
Merge branch 'master' of https://github.com/Nexcius/ggj-hamar

Conflicts:
	Assets/Scenes/busscene.unity
	Assets/Scripts/GUIChoiceRequest.cs
	Assets/Scripts/WorldTimeTriggers.cs
Merge branch 'master' of https://github.com/Nexcius/ggj-hamar