Combined xcode and linux version
Merge branch 'master' of https://github.com/scottnla/pendulumWaves
Merge branch 'keys' of https://github.com/scottnla/pendulumWaves into keys