Changing how things look
Improving shooter code
Merging changes