initial push to desmond
update
update inline js script
update2
resolve merge conflict in index.html
committing most recent local work
resolving merge conflicts
resolving merge conflicts/adding files