Merge commit
Merge branch 'master' of https://github.com/mapto/sprks
Updated timeline. Created 3 separate services
Reverted simulation
Merge branch 'master' of https://github.com/mapto/sprks