getting backbone views to render with data from the server. Everything is still disorganized, that will be the next step
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml