Merge death?
Merge branch 'master' of https://github.com/CainEnabel/HackaTron3

Conflicts:
	pingSafe/app/src/main/res/values/strings.xml