More resources
Merge branch 'master' of github.com:Gastove/scalatra-backbone-test

Conflicts:
	README.md