added data attributes to search results for nina
deleted some merge conflicts
Merge pull request #30 from mule-deer-2014/yohan_katia_search

added data attributes to search results - ok
edits to css
pulling in new master
Merge remote-tracking branch 'origin' into api_profile
experimenting with passing result API id through the router
data id passes from search results through to api profile page
SHIT FUCKING WORKS:))))))
*correction, we can now pass data through to the api profile.
removed console.logs, whitespace, debuggers
Merge pull request #32 from mule-deer-2014/api_profile

Api profile -ok!
Merge branch 'master' of https://github.com/mule-deer-2014/Endpoint
Merge branch 'master' into reviews_for_api_profile

Conflicts:
	source/db/seeds.rb
	source/public/javascripts/router.js