firstcommit
merge conflict fixed
Merge branch 'Mannymin-master'