setting up the project
Merge remote-tracking branch 'origin/master'
setting up the gradle configuration