partial implemenatation of localization
Merge branch 'master' of https://github.com/seanjosephwu/nonogramFun

Conflicts:
	Nonogram/res/values/strings.xml