Message goes here
Merge branch 'master' of https://github.com/jwysosky/Testing

Conflicts:
	readme.txt
added readme file
Merge pull request #2 from jwysosky/readmefile

Readmefile