fix link to dashboard from header
Merge branch 'master' of https://github.com/avalon9000/teach-out
unfinished changes on messages controller for sending out messages
Merge branch 'master' into student-creation
first cut of factories for tests
Merge branch 'master' into student-creation
messages controller incomplete
Merge branch 'master' of https://github.com/avalon9000/teach-out
delete uneeded test folder
updated messages controller to reflect db changes, added active field to true in seeds file, deleted un-used factories folder, added active to attr_accessible in contact model, updated new_message view to display header text in content box
deleted duplicate factories file
Merge branch 'master' into student-creation
first cut of unit tests for teacher
remove redundant factories.rb file
create message show view and model methods
fixed merge conflict in spec/factories.rb (removed file)
Merge branch 'master' into student-creation
merge in sean's awesomeness
Merge branch 'master' into teacher_spec
add teacher validation tests