12:58 PM
Merge branch 'develop' of https://github.com/kalyand14/AndroidApp into feature/feature1

Conflicts:
	manage.txt
Merge branch 'feature/feature1' into develop