Corrected dropdown on home page
Merge branch 'Sean' into Development
unsure of what this is
Fixed merge conflicts
Merge branch 'Users' into Development