Merge pull request #1 from jbrejner/jbrejner/features/new

nice new file
another
modifed fil3
modifed fil3
Build fails without uppercase in this file
Build fails without uppercase in this file
Merge pull request #2 from jbrejner/jbrejner/features/new2

another
Merge branch 'master' into jbrejner/features/new