Deleted junk lines and added test line
tested emoji for useless fun
Merge branch 'kdc/testFeature1'

Conflicts:
	README.md
merged stash