Corrige admin.py de acordo com o PEP8
Merge branch 'master' of github.com:shuhikari/dark_ride
Merge branch 'master' of github.com:shuhikari/dark_ride
Merge branch 'master' of github.com:shuhikari/dark_ride
Adiciona admin e models
Merge branch 'testdrive'

Conflicts:
	project/category/admin.py
	project/category/models.py