2nd change
Merge remote-tracking branch 'origin/master'

Conflicts:
	GIT Practice/src/com/bayviewglen/dayeight/ExampleOne.java
Merge branch 'master' of https://github.com/jjiabvg/Git-Practise

Conflicts:
	GIT Practice/src/com/bayviewglen/dayeight/ExampleOne.java
Merge branch 'master' of https://github.com/jjiabvg/Git-Practise

Conflicts:
	GIT Practice/src/com/bayviewglen/dayeight/ExampleOne.java
Merge branch 'master' of https://github.com/jjiabvg/Git-Practise