a ver si ya la rege xD
Merge branch 'master' of https://github.com/zykorwx/myproject

Conflicts:
	myproject/__init__.pyc
	myproject/settings.pyc
	myproject/urls.pyc
	myproject/views/__init__.pyc
	myproject/views/index.pyc