first add
Initial commit
Merge github.com:Dukeofvampires/3DLFramework

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge https://github.com/Dukeofvampires/DLFRamework

Conflicts:
	README.md