small updates
Merge branch 'master' of https://github.com/griffy/cs1555
admin screens and fixed queries
merge joel's changes
view screens are live
update
merge marissa's changes
update upload to remove git files