# Conflicts:
#   test_stand_firmware/test_stand_firmware.ino

Updating develop to current state of master branch

See merge request !103

adding baremetal programs

See merge request !101

MP4 params fix

See merge request !100

Simulation dev

See merge request !89

# Conflicts:
#   .gitignore
#   .idea/MicroCART.iml

Lfs setup

See merge request !99

Uboot compiler will

See merge request !97

Finished free_graph method, needs testing implementation

See merge request !96