fix link to dashboard from header
Merge branch 'master' of https://github.com/avalon9000/teach-out
Merge branch 'master' of https://github.com/avalon9000/teach-out
create message show view and model methods
fixed merge conflict in spec/factories.rb (removed file)