Merge pull request #4 from quix00/dev

Reordering the imports
Merge pull request #6 from quix00/dev

Minor changes to the Makefile to make it so the variables line up
Merge branch 'dev'
Merging pull request, normalizing the filetypes
Merge branch 'master' of https://github.com/quix00/util