rethemed
Merge pull request #36 from erumble/rethemeify

rethemed
merging development

Conflicts:
	app/views/entries/index.html.erb