Changed CSS styling on existing elements
Merge branch 'master' of https://github.com/glawson/ImageSmith

Conflicts:
	views/manage.jade