Merge branch 'nick's-branch'
Merge branch 'nick's-branch'
Added unit testing
Installed grunt
Adding grunt files to master branch
Merging patrick with master
updated core.js
?

?
Merge branch 'nick's-branch'
Merge branch 'master' into nick's-branch