Fixed guard stuff so test suite can actually run
Merge branch 'ui-edge' of https://github.com/elijahc/rixir into ui-edge

Conflicts:
	app/views/specimens/_form.html.haml
	app/views/specimens/index.html.haml
page fixes and Navbar changes
Button shading and show box
update to subject/new
added background image
set background in stylesheet
added comments
added form to subjects/edit
changes to show