Implementing some modularity in the project
Merge branch 'master' of https://github.com/SantiagoValdez/alfaomega

Because fuck you, thats why