...
Merge branch 'develop' of github.com:sixcodes/api_hackday_21212 into develop
...
Merge branch 'develop' of github.com:sixcodes/api_hackday_21212 into develop

Conflicts:
	apihackday/bolao/views.py
...
merge
Merge branch 'develop' of github.com:sixcodes/api_hackday_21212 into feature/alive_bitch