Change return x to x+5
Trying to merge conflict
making a few changes
up branch
Merge remote-tracking branch 'origin/work'

Conflicts:
	Lab2PushPull/src/Main.java