Commit
Merge branch 'master' of github.com:Jahdere/agenda

Conflicts:
	index.php