ignores
Merge branch 'master' of https://github.com/gdelacruz/play-extjs-sample

Conflicts:
	.gitignore