Merge branch 'varun'
Merge branch 'master' into varun
changed colors
fixed initial bug