Project setup
Merge branch 'master' of github.com:Ichiru/GL-Lancer

Conflicts:
	README.md