commit to merge
server is now started when a register is initiated through Main
fixed conflict by accepting changes