cleanup up files
basic tests for tags, add tags display to topic show view
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Med-Flow
Merge branch 'master' into joseph
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Med-Flow

Conflicts:
	Preventive-Measures/spec/helpers/tags_helper_spec.rb
	Preventive-Measures/spec/models/tag_spec.rb
	Preventive-Measures/spec/models/tagation_spec.rb
	Preventive-Measures/spec/routing/tags_routing_spec.rb
Merge branch 'master' into joseph

Conflicts:
	Preventive-Measures/spec/controllers/tags_controller_spec.rb
Merge pull request #14 from jbwhite/joseph

Joseph
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
Merge pull request #17 from woolly-bear-caterpillars-2014/john-george

John george
fixed merge conflict
Merge branch 'stcrestrada-master'