Merge pull request #189 from alexmckenley/dev

CSS fixes
Implemented naive voting system
Merge branch 'thumb' into dev

Conflicts:
	public/views/search.html
Merge pull request #190 from malucky/dev

Implemented naive voting system