committing a script.
Merge branch 'master' of https://github.com/AMRoche/battlehackAMRoche

Conflicts: scripts/script.js

Also added things written locally.