UC63-TeamA Edited and updated httptests
Merge branch 'master' of https://github.com/knusbaum/CS427-Final into UC63-TeamA