Create README.md
Merge branch 'master' of github.com:jyoko/clean-app
Merge branches 'master' and 'restruct'

Conflicts:
	README.md
Moving things around