Merge
Merge in string.xml
Merge branch 'master' of https://github.com/vin-c-ent/BookBorrow.git

Conflicts:
	.gitignore
	res/values/strings.xml