Update index.php
Update rightside.php

updated dates
Merge branch 'master' into dev

Conflicts:
	basicPhps/rightside.php
changed head (mack to make), thanks cornelius for the hint
Merge pull request #8 from HackerspaceBremen/dev

Dev