optimized api call
content view changes
Merge branch 'master' of https://github.com/phoebebscott/Luxelist

Conflicts:
	app/views/layouts/_content.html.erb
Merge branch 'master' of https://github.com/phoebebscott/Luxelist
Hannahs magic api cross referencing
Merge pull request #17 from phoebebscott/apimods

Apimods