Merge remote-tracking branch 'Alana/master'
so I can merge
Merge remote-tracking branch 'josh/master'
here yall go
WEB SERVICE WORKS! (for drew)
Merge remote-tracking branch 'Drew/master'
Merge remote-tracking branch 'Alana/master'
pulled from drew and jake