updated posts - show.html.erb
Merge pull request #30 from SalamanderMike/master

Posts index working
logon and authorization added to app
what?
fix merge
Prepping for authentication
Merge branch 'master' of git://github.com/Siejen/2014WDI_SuperGrp

Conflicts:
	micro_blog/Gemfile
	micro_blog/app/controllers/application_controller.rb
Merge with authentication
updated the addition of comments to posts and updated the routing for root to /login page
updated posts controller
Users authentication integration complete
refactored and styled flash for new user
Merge pull request #31 from ncaskey04/master

refactored and styled flash for new user
update to seed file which includes password
erge branch 'master' of https://github.com/Siejen/2014WDI_SuperGrp
commented regex validation so that rake db:reset and seed.rb works
merged Mike's changes
Merge branch 'SalamanderMike-master'
updated the app so users can only edit their own posts and not of others
updated the app so users can only edit their own user profile (pages show.html.erb)
users#show only allows changes to current_user