Identity crisis.
Merge branch 'master' of github.com:spencerfinnell/twentytwelve-edd