gitignore
Merge branch 'master' of github.com:SirZach/file-explorer-ember

Conflicts:
	.gitignore