Merge branch 'master' of D:\FYP\VISIRI\VISIRI with conflicts.
Modified incompatible types