Merge branch 'lab-03-routing-start' into lab-03-routing-solved

* lab-03-routing-start:
  switching to karma-browserify and removing protractor
  react-classes to classNames

Conflicts:
	client/src/components/common/navigation/navbar.jsx
	client/src/components/projects/project.row.jsx
	client/src/components/timesheets/timesheet.row.jsx

client/src/components/projects/project.row.jsx

@@ -9,7 +9,7 @@ var ProjectRow = React.createClass({
   },
 
   mixins: [
-    Router.Navigation,
+    Router.Navigation
   ],
 
   render: function () {
@@ -21,6 +21,7 @@ var ProjectRow = React.createClass({
 
     return (
       <tr className={rowClasses}>
+
         <td>{project.name}</td>
         <td>{project.description}</td>
       </tr>

package.json

@@ -82,7 +82,7 @@
     "gulp-util": "^3.0.3",
     "gulp-watch": "^4.1.1",
     "karma": "^0.13.8",
-    "karma-bro": "^0.11.1",
+    "karma-browserify": "^4.3.0",
     "karma-chrome-launcher": "^0.2.0",
     "karma-firefox-launcher": "^0.1.4",
     "karma-mocha": "^0.2.0",
@@ -91,7 +91,6 @@
     "lazypipe": "^1.0.1",
     "merge-stream": "^0.1.7",
     "mocha": "^2.2.1",
-    "protractor": "^2.1.0",
     "proxyquire": "^1.4.0",
     "proxyquire-universal": "^1.0.3",
     "proxyquireify": "^3.0.0",