shoiuld conflct

Conflicts:

	asdf.txt
Merge pull request #8 from tdeazeta/development

shoiuld conflct