strange code added
more strange code added
good code added in master
another good code added
Merge branch 'strangebranch'

Conflicts:
	index.php
Now this is a working app
date output added
Merge branch 'initial-branch'

Conflicts:
	index.php

Solved