Merge branch 'master' of heroku.com:tweet-more

Conflicts:
	templates/layout.html
add link support
Merge branch 'master' of github.com:dedeler/tweet-more