db + login
Merge branch 'develop' of https://github.com/janteuni/yolo_battle into develop

Conflicts:
	index.php
	style.css