add *
Merge branch 'master' of github.com:massinet/timelineproject