All tests are passing (even Fedex).
Added a background-image: none to fix an assets compile error.
Merge branch 'new_styling' of github.com:cbrown97/beheld into merging

Conflicts:
	app/assets/stylesheets/style.css
Added Artwork medium, genre, and subject matter form fields.
Tweaked RailsAdmin to allow promoting users to admins.
style changes
Profile changes and general style changes

Conflicts:
	app/views/pages/selection.html.erb
style changes, removed old html.erb pages and reformatted other pages.