initial commit
Merge remote-tracking branch 'desorigin/master'

Conflicts:
	.gitignore
	error_log
	register.php
	sendemail.php
updating .gitignore