Update UserInput.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	UserInput.py
Update UserInput.py
Update UserInput.py
Update UserInput.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	UserInput.py
Update UserInput.py
Merge branch 'master' of https://github.com/WahlKri/ChultsiExercise-1

Conflicts:
	.idea/workspace.xml