error log
Merge branch 'master' of github.com:scttw/bulli2
Merge branch 'master' of github.com:scttw/bulli2
Merge branch 'master' of github.com:scttw/bulli2
Merge branch 'master' of github.com:scttw/bulli2
Merge branch 'master' of github.com:scttw/bulli2
Merge branch 'master' of github.com:scttw/bulli2