Tagit bort blue,green,red och flying_objects_test.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.cpp