new features

defences~!
Merge branch 'master' of https://github.com/wheressswaldo/CS3113