will sync.
working on.
Merge branch 'master' of https://github.com/tearsofphoenix/GraceRoad-Android

Conflicts:
	.gitignore