Need to pull. Minimal changes
Merge branch 'master' of github.com:jhavlicek91/Project2

Conflicts:
	ui.py