adding files to DEVELOP branch
scheduling arrays
backlift folder commit
resolve merge conflict in index.html
committing most recent local work
resolving merge conflicts
adding backlift to assets
resolving merge conflicts/adding files