file type
Merge branch 'master' of https://github.com/Sheepzez/demo

Conflicts:
	README.md