Merge pull request #26 from dejan-brkic/russ_master

Merge branch 'master' of github.com:russdanner/studio2 into russ_master