Python 34 installed with DJango via PIP
Merge branch 'master' of https://github.com/wesleymilan/django

Conflicts:
	README.md