Sting Updates
strings
Merge branch 'master' of https://github.com/CD2/graph.works.android

Conflicts:
	app/src/main/res/values/strings.xml
layout update
Merge pull request #1 from CD2/layout

Layout