Fetching from remote, to setup local repo again.
Merging local fixes with old remote stuff...
added colons to cram.js
merging from master to get a fresh start after data loss
fixed .gitignore, bad merge messed it up.