got rid of errors again
Merge branch 'master' of https://github.com/Tadimsky/vooga
Merge branch 'master' of https://github.com/Tadimsky/vooga