Add hitboxes
Merge remote-tracking branch 'origin/master'
Send health setters between server and clients
Merge remote-tracking branch 'origin/master'
Send health setters between server and clients
Merge remote-tracking branch 'origin/master'
Send health setters between server and clients
Merge remote-tracking branch 'origin/master'
 (BROKEN CURRENTLY)Taylor: commiting johns code to work on while he's sleeping (BROKEN CURRENTLY)
Merge remote-tracking branch 'origin/master'