Version 2.0

Fixing thesis template. Probably will start from scratch.