.idea
Merge branch 'routing' of github.com:gavinmcdermott/emberize into routing

Conflicts:
	.idea/workspace.xml
Merge branch 'routing' of github.com:gavinmcdermott/emberize into routing

Conflicts:
	.idea/workspace.xml
initial search routes working