solved merged conflict
Merge branch 'master' of https://github.com/mrtajvidi/CS304-Project