Putting everything together

Richard and nicolas were both working hard on the game communicating all the way through all we have to do is put both builds together but as were doing that im still editing the code to make sure the game still works as intended