ask for help + updatelocate work done
Merge branch 'master' of https://github.com/F0l2g3tm3n0t/Senior-Project

Conflicts:
	app/src/main/java/lab/kultida/seniorproject/MainActivity.java