Updated - Added loads more classes
Merge branch 'master' of https://github.com/CMNatic/Reborn