Merge branch 'master' of https://github.com/elliottsj/Cards-UI

Conflicts:
	.gitignore
	README.md

Restructure directories