add the final two models
Merge branch 'master' of https://github.com/garcianavalon/NexToU

Conflicts:
	accounts/models.py