Merge branch 'master' into jbrejner/features/new
removed some files
Merge pull request #3 from jbrejner/jbrejner/features/new

Jbrejner/features/new