working on fixing checkbox ui and mass assignment issues
Merge branch 'master' of github.com:LeeHampton/group_project_1

# By Lee Hampton
# Via Lee Hampton
* 'master' of github.com:LeeHampton/group_project_1:
  Fix styling for displaying post body
  Add ability to mark answer as solved in post view, fix comment styling/formatting, add custom route for marking solved, modify seed data to reflect marking answers as solved
  fix css for post view
  Add show Post functionality and styling with commenting functionality and formatting
  Add rough layout for show post page
Merge branch 'master' of github.com:LeeHampton/group_project_1

# By Frank
# Via Frank
* 'master' of github.com:LeeHampton/group_project_1:
  Add authorization for delete in posts, users, and comments. Add a bit more CSS styling to users show and edit page.
  Add user show page and edit page. Add basic CSS to these pages. Add validation for unique user names. Add authentication for user controller with the exception of creating new users.
  Flesh out user show page with some basic css and information.
  Fix gradients on buttons on home/index.haml
normalizing
normalize
more normalize,  so as to not force unwanted merges
Merge branch 'master' of github.com:LeeHampton/group_project_1

# By Frank (8) and Lee Hampton (3)
# Via Frank (2) and Lee Hampton (1)
* 'master' of github.com:LeeHampton/group_project_1:
  Fix CSS for home/index which removes .icon-container css from the navbar.
  Add more styling to home/index.haml
  Remove CSS from bootstrap overrides. Create inline style for application.css. Create home.scss for home styling. Remove bootstrap buttons on home/index.haml. Remove authenticate! from sessions_controller and change to authenticate method.
  Add styling to show page. Add more styling to Edit page and add bio field to form.
  Add create post functionality -- styling off
  Normalize before pull
  fix navbar css
  Get update user route to work. Bug: signs out after update. Remove gem 'bootstrap-wysihtml5-rails' from gemfile. Be sure to bundle install. @mixedmedia @leehampton
  fuct
  Fix broken update route. Still broken.
  Normalize before pull

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/controllers/posts_controller.rb
	app/views/posts/new.html.erb