after conflict
conflict resolved test
after conflict
Merge branch 'test'
after conflict
ok
after conflict
ok
Base folder structure added
Base folder structure added
libs and assets folders added
Folder fix
Folder fix
Test
Merge branch 'master' of github.com:G3F4/FSDL
tetetet
Revert "tetetet"

This reverts commit b1bdcd8c94826e37807d5d9f9e3b5507be687579.
Revert "libs and assets folders added"

This reverts commit df6415f82f6ef8131dde922e688f25110d8ba6fc.

Conflicts:
	assets/info.txt
	libs/info.txt
README fix