Base
updated readme
Merge branch 'master' of github.com:rosscdh/django-box

Conflicts:
	LICENSE
	README.md