testing before merge
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of
git@github.com:shobhitdutia/com.example.labapplicationapk.git

Conflicts:
	LabApplication/src/com/example/labapplicationapk/JoinImpl.java
Merge remote-tracking branch 'origin/master'
Created ViewAddUser file
tempCommit
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of
git@github.com:shobhitdutia/com.example.labapplicationapk.git

Conflicts:
	LabApplication/src/com/example/labapplicationapk/JoinImpl.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	LabApplication/src/com/example/labapplicationapk/JoinImpl.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	LabApplication/src/com/example/labapplicationapk/JoinImpl.java
changes made by ruturaj's code merged