Install oembed gem
Ignore OS X's weird .DS_Store files.
Embed up to 10 popular #edchat and #education tweets
A confusing log thing I don't understand.
Merging master into my local repo
Merge party
Get Instagram requests working
Merge branch 'master' of https://github.com/jam-tmrw/teachers

Conflicts:
	.gitignore
	config/environment.rb

Merge master into my version.