Hello!
Test
Revert "Test"

This reverts commit bf730c92193d690bb03e1a2f86155d4e8a63db3a.
Added makefile & fixed bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main.cpp
Fix stupid
fixed first demo
Finished Company implementation
Merge remote-tracking branch 'origin/Colin'
Merge branch 'master' into Colin