/
Merge remote-tracking branch 'origin/master'

Conflicts:
	Git practice #2/.classpath
Merge branch 'master' of https://github.com/mhusseinbvg/Git