init
Merge branch 'master' of https://github.com/deniotokiari/MaterialSample

Conflicts:
	.gitignore