STAY DROP DOWN STAY

PULLED AN ALL NIGHTER FOR THIS IMPORTANT PART.....
Merge branch 'master' of https://github.com/titse/COGS187B-project

FIXED MY OWN MERGE CONFLICT