Re-pulling from master (starting over).
Slide-panel has just begun to work.
Coming together.
Left panel looks & functions good enough.
Pulling changes from upstream.
Merge branch 'sidepanels2'

Conflicts:
	app/scripts/controllers/main.js
	app/styles/feed.css
	app/views/index.html
	app/views/partials/main.html
	app/views/partials/navbar.html
Merge pull request #37 from janaspage/master

We now have a side panel.
Merge branch 'master' into instagram

Conflicts:
	app/views/partials/main.html