added mouse x,y input - starting on picker
Merge branch 'master' of https://github.com/mcaswell/CS-450

Conflicts:
	assignment3/src/prog