Creating a conflict with Github
sdfsdfMerge branch 'master' of https://github.com/spicyagua/g2

Conflicts:
	README.md