minor changes
Minor repairs
Merge branch 'dev'
commit
Conflicts:
	micro_blog/app/views/pages/new.html.erb
Merge branch 'master' of git://github.com/Siejen/2014WDI_SuperGrp into dev
group merge
Fixed users bugs
Merge branch 'dev'
merge fix user bugs
Conflicts:
	micro_blog/app/controllers/users_controller.rb
Merge pull request #39 from SalamanderMike/master

Fixed users bugs
yellow buttons for site