Add lineheight, a color, border
Merge branch 'master' of https://github.com/terriblesarcasm/testing-node

Conflicts:
	public/css/style.css