Pulling from upstream
Pulling from upstream
Deleted unnecessary bower components folder.
Pulling from upstream
Got rid of merge conflict markers.
tried to resolve merge conflicts
Fixed some syntax errors.
Pushed changes to git.
Added handlebars template into js file.
Upload route works with Backbone and Handlebars.
Added 'use strict'; to 2 lines to avoid error in browser.
Returning to master.
Creating form.
merging from master.
I'm an idiot.
About to work on merge conflicts.
Cleared out git merge conflict marker from index.html.
Erased git conflict markers from main.js, along with a block of code.
Replaced local url in the ticket-get ajax request with our heroku address.
First merge conflict check.