Made a spike shooter
merging conflicts