Jacob branch

added 1 second loop and tidied up some conflicts in main.js