Custom Grid Layout
Merge branch 'master' of https://github.com/lucaslra/Android-Study

Conflicts:
	.gitignore