Merged .main margin change
Merge branch 'master' of github.com:hellobrowncow/newarapi2 into styling

Conflicts:
	app/assets/stylesheets/application.css
"Added app background image"
"Removed clothing labels from Collections Index"
"Refactored Collection Show page"
"Refactored Items Index"
"Refactored Items Index, Refactored Login"
"Refactored new signup and login"
"Refactored splash welcome page"
"Refactored Items Index"
"Refactored Navbar Menu"
"Refactored navbar title"
"Refactored navbar title and Item Show"
"Added top margin to overlays"
"Refactored User form partial"
"Refactored Item Edit"
"Refactored Item Edit"
"Refactored Item Edit and Collections form partial"
"Refactored Collection Show"
"Refactored Collection Show and Collections Index"