Merge pull request #38 from SalamanderMike/master

fixed minor signup bug
app updated with latest edits - new user signup still needs to be edited and saving page updates still needs to be taken care of
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