init
init
Merge branch 'master' of github.com:revington/mvc_clash

Conflicts:
	README.md