added files and prop
erge branch 'master' of https://github.com/Lactor/UROP_Comp