Finished some jquery logic about accessing the proper array for each data
Resolved Conflict
Merge branch 'master' of github.com:kyle-cackett/brown-hackathon