fdsa
Merge branch 'master' of github.com:stuycs-softdev/ScavengerTours
added icons!
changed images
added signin form
added signup
minor adjustments
I did things
more things
got rid of a stray 'x'
added further functionality
fixed conflicts