Merge into Sharlene's master
Merge with Tianchi's changes again
Merge branch 'master' of github.com:sharlwong/pong
Playing around with more graphics
Minor edits to graphics