Prep for merge.
Fixed merge conflict.
Completed formatting of colors.
Completed implementation of AJAX color submissions and responses.
Working on parsing JSON on page load.
Compeleted JSON query and response on page load for colors.
Completed basic JSON upload functionality.
Completed basic JSON functionality, some code snippets for later in show.js.erb.
Completed all JSON return functionality on asset submission.
Fixed issue with menu not being produced for JSON logos.
Completed AJAX functionality
Completed merge of show.js.erb
Merge branch 'development' of github.com:climbingcode/bam- into development
Completed merge conflict resolution.
Completed merge conflict resolution.
Fixed merge conflicts