added a test file
removed useless files
changed class name and src info
modified helloworld
Changes to README
Changes to readme
Merge branch 'fix_readme'

Conflicts:
	README.md
changes?
Committing lots of changes
Added all merge conflicts without actually addressing merge conflicts. Hopefully this doesn't screw things up too much