Merge branch 'master' of github.com:dangerdak/chrapp
Merge branch 'master' of github.com:dangerdak/chrapp