keng
Merge branch 'master' of github.com:appdevinc/appdevinc

Conflicts:
	Text.txt