added console.log abbreviation; set tabs to 2 spaces
updated terminator
Merge branch 'mast'