fixed broken rspec
Merge branch 'master' of github.com:rickbrunstedt/meditag
commit before merge
Merge branch 'master' of github.com:rickbrunstedt/meditag
removed pending tests
added a condition test