Issues with code collaboration
Merge branch 'master' of https://github.com/Maxrimus/Lamia-Vittas

Conflicts:
	Lamia Vittas/bin/WindowsGL/Debug/Lamia Vittas.exe
	Lamia Vittas/bin/WindowsGL/Debug/Lamia Vittas.pdb
	Lamia Vittas/obj/x86/Debug/Lamia Vittas.exe
	Lamia Vittas/obj/x86/Debug/Lamia Vittas.pdb