yes
Merge branch 'master' of github.com:Singularity623/project3

Conflicts:
	res/values/strings.xml
updated res folder'