Added initial stuff
Merge branch 'master' of https://github.com/EpicSauceBro/UberFrameShop

Conflicts:
	.idea/workspace.xml
no message