Deleted Master.txt
Added word cool to 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