actual files not links
Merge branch 'master' of https://github.com/obitoo/tempLogger

Conflicts:
	www/graph_fns.php
	www/index.php

merged