Fixed worksheet names
Merge branch 'master' of github.com:jhavlicek91/Project2

Conflicts:
	ui.py
Merge branch 'master' of github.com:jhavlicek91/Project2

Conflicts:
	ui.py