branch develop from master
code
added feature 1
Revert "added feature 1"

This reverts commit 243bc2359096ba02a6a06e4f3e19274a8c857d2b.
Revert "Revert "added feature 1""

This reverts commit eeec9f8c03d70573cd68afad428d2eb1436f3c00.
added feature 2
edited feature 2
editing file, this is dev after all
new functionality yay
feature 2 update
more core
Merge branch 'feature_2' into develop