conflict change
Merge branch 'Special-Feature' of https://github.com/maaznasir/DroidCity into Special-Feature

Conflicts:
	mainfile.c