Initial android project setup
Majority of project files have not been commited
Resolving an unmerged into 'master'conflict