efdzefd
Merge branch 'master' of https://github.com/yannchaput/WeddingPlanner.git

Conflicts:
	AndroidManifest.xml
Initiate pie chart screen