Implementing main class

- adding user input for option 2 and 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/brett/Sample.java