major modifications in all parts, tex up to date
Merge branch 'master' of https://github.com/Neodyblue/MajorProject