New Branch, Room.java, new contstructor.
Added int i instance var to testBranch1 to Room.java
Deleted extraneous characters from Room.java
Merge remote-tracking branch 'origin/testBranch1'

Conflicts:
	src/LearnGit2/Room.java