Merge origin/master

Conflicts:
	src/mygitproject/MyGitProject.java
Merge origin/master

Conflicts:
	src/mygitproject/MyGitProject.java