Logic

Merging edited UserInput class and Logic class