README edit
Merge branch 'master' of https://github.com/delta/timeline-front

Conflicts:
	README.txt