basic tests for tags, add tags display to topic show view
Merge branch 'master' into joseph
added rspec for topic model
topic should eq a title
rspec passed
Merge branch 'master' into joseph

Conflicts:
	Preventive-Measures/spec/controllers/tags_controller_spec.rb
added rspec for topic model
topic returns a body
rspec passed
added validations for presence of body and title in topics model
Merge pull request #14 from jbwhite/joseph

Joseph
added valid params rspec for topics model
added rspec to test belongs to user for topic
added rpsec assocations for topic model
has many tags
has many comments
rspec passed
finish user controller test and start travis integration
Merge pull request #15 from woolly-bear-caterpillars-2014/john-george

finish user controller test and start travis integration
added another travis yaml file
Merge pull request #16 from woolly-bear-caterpillars-2014/john-george

added another travis yaml file
spelled yml correctly
added yml files
added yml file
completed rspec tests for topics model
Merge pull request #17 from woolly-bear-caterpillars-2014/john-george

John george
fixed merge conflict