show goals
Merge branch 'master' of github.com:akdor1154/fit3140

Conflicts:
	assignment3/simulation.py