Updated Proposal
Merge branch 'master' of https://github.com/mjftw/uni_work 'updated proposal'