Local db/schema
Merge branch 'master' of https://github.com/nathanConn/TTS-Raleigh-Fall-14-Project
Updated Post Routes
User validation, added password_digest to User model.

Added validations and formats to user data.  Password_digest added to
User model, and the bcrypt gem.  Testing for all the respective code
thus far in test/user_test.rb.
Merge pull request #4 from nathanConn/User_auth

User auth
Working Posts new/show/all
Merge pull request #8 from nathanConn/posts

Posts
Changes to static pages and dynamic home view
Merge branch 'master' of https://github.com/nathanConn/TTS-Raleigh-Fall-14-Project
Revert "Changes to static pages and dynamic home view"

This reverts commit 674c7a0c74db9b8fdae8e6be50e630131ab8c963.
first revert
Changes to home page, static pages, and search bar
bootstrap
local bootstrap commit
Merge pull request #11 from nathanConn/app_view

App view
routes and site wide nav
working nav links
Merge branch 'master' into ody_comments

Conflicts:
	app/models/post.rb
	app/models/user.rb