Changed something, just trying to sync
Merge branch 'master' of https://github.com/politickr/project

Conflicts:
	politickr13/templates/register_form.php