i'm so confused
Merge branch 'dev' of https://github.com/aefreedman/of_v0073_win_cb_release into aarondev
Stars!
Merge remote-tracking branch 'origin/PrePlaytestFri' into aarondev

Conflicts:
	apps/myApps/Ksc_PAlpha_Rebuild_0_0_1/src/BlackHole.cpp
	apps/myApps/Ksc_PAlpha_Rebuild_0_0_1/src/Planet.cpp
	apps/myApps/Ksc_PAlpha_Rebuild_0_0_1/src/Sun.cpp
Bug fixes; secret red-giant and blue-dwarf stars!
5/8 level progression
Merge remote-tracking branch 'origin/goldlevels' into aarondev
Messages are owned by individual astronauts & move with them; fixed non-existing level handling
GameOver menu switching
quit button; astronaut following counting; automatic save file deletion
level updates and astrochat
Merge remote-tracking branch 'origin/PrePlaytestFri' into aarondev

Conflicts:
	apps/myApps/Ksc_PAlpha_Rebuild_0_0_1/src/testApp.h
Merge remote-tracking branch 'origin/tonisux' into aarondev
Added following astronaut indicators.
Tutorial astronauts speak more quickly
final level UPdates- lev 16 and 18 and deleted 19
Endscreen & game looping
Final changes
Merge remote-tracking branch 'origin/tonicopy' into aarondev
Project file