Apparently this didnt cary over
Merge branch 'master' of https://github.com/Kyxsune/Learning

Conflicts:
	.idea/misc.xml