Merge branch 'master' of https://github.com/Sajfer/EDA397-Group6

Conflicts:
	app/src/main/java/com/EDA397/Navigator/NaviGitator/Activities/GitFunctionality.java