Merge remote-tracking branch 'origin/master'
Added Switches + Door
Added Circles
Updated Player
Added Colors to Spikes
Merge remote-tracking branch 'origin/master'
Splashscreen
Merge remote-tracking branch 'origin/master'
merge
Merge branch 'master' of https://github.com/papayafiction/triangula