Updated data.php with some more information
Merge branch 'master' of https://github.com/liole/ami-23_git-website
Created calendar (alternative schedule). Not finished. Requires improvement
Merge branch 'master' of https://github.com/liole/ami-23_git-website

Conflicts:
	template.php
Fixed conflicts in template.php