Initial commmit
Playing with gradle
Merge conflict resolved