Cleaning up old django files, adding new webpy files--updating
Merge branch 'master' of github.com:xenses/RobotsandTea

Conflicts:
	README
	blog/models.py
	urls.py