adding timeline and about section
Merge branch 'master'

defaulting config file and resolve index.php

Conflicts:
	index.php
	resources/config.php