new branch
Merge branch 'Announcement' of https://github.com/techhatch/toky into Announcement
Merge branch 'Announcement' into mainpage

Conflicts:
	index.php
i fixed it allgit pullgit pull
Merge branch 'mainpage'
Fix label nesting
Merge branch 'mainpage'
Duplicate filters
Merge branch 'mainpage'