Initial commit
Merge branch 'master' of https://github.com/IMDC/Intimate-Interfaces-Android-App
Initial setup conflict