initial commit
initial commit
finished building program
added comments to build.js / removed block borders
Resolve git add/add branch merge conflict by deleting conflicted
Merge branch 'gh-pages' of github.com:djfordz/project_js_jquery into gh-pages

Resolved add/add merge conflict by deleting conflicted.
 Resolved git add/add branch merge conflict by deleting conflicted files