Merged master and jacob branch, for ease of access

Merged the master and jacob branches to save space, and to organise everything