Added info to About.txt
Merge branch 'development'

Conflicts:
	About.txt
Deleted Development.txt
Merge branch 'master' into development

Conflicts:
	Development.txt
Modified Development.txt
Made changes to Master.txt
Merge branch 'master' into development

Conflicts:
	Master.txt