took off the links

I took off the part that said link 1,2 and 3 but I'm not sure if that's
what I am supposed to do and I can't check it
got rid of top links
Merge pull request #2 from CarolynJoung/master

top links
Working on getting Cosmo up and working.
Confirmations and Mailer folder buttons
Merge branch 'master' of https://github.com/EricBoersma/jabberbox

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #3 from grant-m-avery/master

Confirmations and Mailer folder buttons
Merge pull request #7 from TheresaAndary/master

Recomitting
Merge pull request #1 from EricBoersma/master

Getting the changes to you.