Attempted to fix strings.
Merge branch 'master' of https://github.com/jamesalfei/Digital2014.git

Conflicts:
	Android app/res/values/strings.xml

	FINALLY FIXED MY BRANCH.
Merge branch 'master' of https://github.com/jamesalfei/Digital2014.git
Finally resolved conflicts