dc
Merge branch 'master' of https://github.com/appdevinc/appdevinc

Conflicts:
	Text.txt