Merge branch 'master' of https://github.com/VeriteCo/TimelineJS

Conflicts:
	README.markdown
Merge branch 'master' of https://github.com/StrictlySkyler/TimelineJS