Try commit again
Merge branch 'yii-framework' of https://github.com/Sneddo/brewpi-www into yii-framework