pulling
Merge branch 'master' of https://github.com/joshricha/project_2
colors partial