Colors now acquired with getColors()
Merge branch 'master' of https://github.com/Vadskye/cs294-project