Lynns changes
Merge branch 'master' of https://github.com/emudrak/CSCUIntermedR