admin page
new branch
Merge branch 'master' into back
fixed login
Merge branch 'Announcement' of https://github.com/techhatch/toky into Announcement
Merge branch 'Announcement' into mainpage

Conflicts:
	index.php
properly logs out
Merge branch 'master' of https://github.com/techhatch/toky
Made image larger on header
inlined up inputs
inlined up inputs
changed name to js
Changed colors
Moved sidebar up
Merge branch 'master' of https://github.com/techhatch/toky
Moved sidebar up
Merge branch 'master' of https://github.com/techhatch/toky
i fixed it allgit pullgit pull
Removed first link
Merge branch 'mainpage'