First functional prototype
Merge branch 'master' of https://github.com/AlexLusitania/OR-GLPK into AlexLusitania-master

Conflicts:
	blade-flyer/algo_enum_prototype.cpp