messing around with directives and filters
Merge branch 'master' of https://github.com/nrooney/angular