Update readme, fix bugs
Merge pull request #84 from freeslugs/gilad/wiki-update

Update readme, fix bugs
good thing no hackers read our commits
Merge pull request #88 from danrschlosser/dev_routes

good thing no hackers read our commits
fix images
fix badstatusline errors on instance fetch
fix badstatusline errors on instance fetch
jawbone and altschool become shapeways
Merge pull request #90 from danrschlosser/a16z_dropout

A16z dropout
Update resources.json
Update resources.json
Update resources.json
Merge pull request #91 from lifeismotley/master

Update resources.json -- added data structures overview material
better metas
better metas
resolve all merge conflicts.....
desc
meta
Merge pull request #87 from alanhdu/master

Logging
Close #86, redirects /admin/users/me