initial merge of alwayswin and glados