CSS for: links, spacing, etc.
Merge branch 'master' into css

Conflicts:
	app/views/layouts/application.html.erb
styling shennanigans
merged master into branch
Merge pull request #30 from JamieMcKenzie/css

Css