change in dev1
Merge branch 'integration-grunt' of /Users/clau/Projects/Javascript/lets-code-javascript/lessons-learned/continuous-integration-with-git/integration into dev1
Merge branch 'dev1' into integration-grunt

* dev1:
  change in dev1
Change in dev2
Merge branch 'dev2' into integration-grunt

* dev2:
  Change in dev2
Done implementing grunt :)