initial commit and pushing to github
Merge branch 'master' of https://github.com/Sharlock93/Java

Conflicts:
	README

s
"cleaning up"