Server updated
Server updated with conflicts merged
Merge branch 'master' of https://github.com/alecbenzer/hack-illinois-kvstore