working on data
finished data
trying to merge
Trying to merge!Merge branch 'api'
I dont kbow why it wants me to do this
merge conflict
Merge branch 'master' of https://github.com/shanemiller500/Judgement-Day
update