shit

ffff
why i cannot sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/config/database.php
	application/views/includes/header.php
	application/views/signup_form.php
	css/style.css