final updates of the night.... things are kind of crashing
dummy function for fun
Merge remote-tracking branch 'origin' into gkiar
our final thing broseph
merging things
merge conflicts