fixed a conflict from merge
Merge branch 'master' of https://github.com/Reyko/FinalProject-WeGotCoders