prettier
Merge branch 'master' of https://github.com/vkozina/BRHacks

Conflicts:
	real code/Groups/database.pyc
	real code/Groups/models.pyc