merging bower config

Author: lauren mccarthy

Gruntfile.js

@@ -48,20 +48,20 @@ module.exports = function(grunt) {
         }
       },
     },
-     update_json: {
-        // set some task-level options
-        options: {
-          src: 'package.json',
-          indent: '\t'
-        },
-        // update bower.json with data from package.json
-        bower: {
-          src: 'package.json',    // where to read from
-          dest: 'bower.json',     // where to write to
-          // the fields to update, as a String Grouping
-          fields: 'name version description repository'
-        },
+    update_json: {
+      // set some task-level options
+      options: {
+        src: 'package.json',
+        indent: '\t'
       },
+      // update bower.json with data from package.json
+      bower: {
+        src: 'package.json',    // where to read from
+        dest: 'bower.json',     // where to write to
+        // the fields to update, as a String Grouping
+        fields: 'name version description repository'
+      },
+    },
     requirejs: {
       unmin: {
         options: {

lib/p5.js

@@ -1,4 +1,4 @@
-/*! p5.js v0.3.6 September 18, 2014 */
+/*! p5.js v0.3.7 September 19, 2014 */
 var shim = function (require) {
     window.requestDraw = function () {
       return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {