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
Users authentication integration complete
merged Mike's changes
Merge branch 'SalamanderMike-master'