Get gulpfile update
Merge branch 'master' of https://github.com/gMajr/gMajorMobile
Merge pull request #3 from villanuevawill/master

Included extensive comments on library code.
Getting Will V's comments
Merge branch 'master' of https://github.com/gMajr/gMajorMobile
Added a grid template / controller to the app.
Created simple button grid directly in template and sized using css.
Grid displays based on controller array of columns composed of targets.
Merge pull request #4 from onetruebob/master

Displays grid of buttons
Add node server
Spell 'server' correctly
Switch to express
Serve static files
Merge pull request #5 from tochiai/master

Express server serves index.html
Updated to use SVG to generate grid buttons
Created factory to generate grid touch target objects that will later be rendered in the SVG
Merge branch 'master' of https://github.com/gMajr/gMajorMobile into svgUiGrid
Set up basic logic on audio functions in relation to the angular framework
Merge branch 'master' of https://github.com/gMajr/gMajorMobile into soundSkeleton
Merge branch 'svgUiGrid' of https://github.com/gMajr/gMajorMobile into soundSkeleton

Conflicts:
	www/index.html
	www/js/app.js
	www/js/controllers.js
	www/js/services/menuService.js
	www/templates/grid.html
Dots now make sound!
Merge branch 'soundSkeleton'